Combine detectors into single library (#237)

* Make AtPxCT build again * Allow targets to have many ROOT dictionaries * Combine detectors into single library This should help control the many root-level folders. Adjusted the root dictionary generation to allow for multiple dictionaries to be added to any target (library). This can speed up build times for larger libraries if the dictionaries are split up logically. The dictionaries are each defined by their own linkdefs. See `AtDetectors` for an example. * Combine AtField and AtPassive into AtDetectors AtField and AtPassive are not used by anything else in the compiled code base. They are loaded by ROOT to run simulations at the same time as the detectors. --------- Co-authored-by: anthoak13 <[email protected]>
ATTPC · Jun 20, 2024 · 3605006 · 3605006
1 parent f81a30a
commit 3605006
Show file tree

Hide file tree

Showing 92 changed files with 124 additions and 285 deletions.
diff --git a/AtApollo/CMakeLists.txt b/AtApollo/CMakeLists.txt
diff --git a/AtDeGAi/CMakeLists.txt b/AtDeGAi/CMakeLists.txt
diff --git a/AtApollo/AtApollo.cxx → AtDetectors/AtApollo/AtApollo.cxx b/AtApollo/AtApollo.cxx → AtDetectors/AtApollo/AtApollo.cxx
diff --git a/AtApollo/AtApollo.h → AtDetectors/AtApollo/AtApollo.h b/AtApollo/AtApollo.h → AtDetectors/AtApollo/AtApollo.h
diff --git a/AtApollo/AtApolloContFact.cxx → AtDetectors/AtApollo/AtApolloContFact.cxx b/AtApollo/AtApolloContFact.cxx → AtDetectors/AtApollo/AtApolloContFact.cxx
diff --git a/AtApollo/AtApolloContFact.h → AtDetectors/AtApollo/AtApolloContFact.h b/AtApollo/AtApolloContFact.h → AtDetectors/AtApollo/AtApolloContFact.h
diff --git a/AtApollo/AtApolloCrystalCalData.cxx → ...ctors/AtApollo/AtApolloCrystalCalData.cxx b/AtApollo/AtApolloCrystalCalData.cxx → ...ctors/AtApollo/AtApolloCrystalCalData.cxx
diff --git a/AtApollo/AtApolloCrystalCalData.h → ...tectors/AtApollo/AtApolloCrystalCalData.h b/AtApollo/AtApolloCrystalCalData.h → ...tectors/AtApollo/AtApolloCrystalCalData.h
diff --git a/AtApollo/AtApolloDigitizer.cxx → AtDetectors/AtApollo/AtApolloDigitizer.cxx b/AtApollo/AtApolloDigitizer.cxx → AtDetectors/AtApollo/AtApolloDigitizer.cxx
diff --git a/AtApollo/AtApolloDigitizer.h → AtDetectors/AtApollo/AtApolloDigitizer.h b/AtApollo/AtApolloDigitizer.h → AtDetectors/AtApollo/AtApolloDigitizer.h
diff --git a/AtApollo/AtApolloLinkDef.h → AtDetectors/AtApollo/AtApolloLinkDef.h b/AtApollo/AtApolloLinkDef.h → AtDetectors/AtApollo/AtApolloLinkDef.h
diff --git a/AtApollo/AtApolloPoint.cxx → AtDetectors/AtApollo/AtApolloPoint.cxx b/AtApollo/AtApolloPoint.cxx → AtDetectors/AtApollo/AtApolloPoint.cxx
diff --git a/AtApollo/AtApolloPoint.h → AtDetectors/AtApollo/AtApolloPoint.h b/AtApollo/AtApolloPoint.h → AtDetectors/AtApollo/AtApolloPoint.h
diff --git a/AtDeGAi/AtDeGAi.cxx → AtDetectors/AtDeGAi/AtDeGAi.cxx b/AtDeGAi/AtDeGAi.cxx → AtDetectors/AtDeGAi/AtDeGAi.cxx
diff --git a/AtDeGAi/AtDeGAi.h → AtDetectors/AtDeGAi/AtDeGAi.h b/AtDeGAi/AtDeGAi.h → AtDetectors/AtDeGAi/AtDeGAi.h
diff --git a/AtDeGAi/AtDeGAiContFact.cxx → AtDetectors/AtDeGAi/AtDeGAiContFact.cxx b/AtDeGAi/AtDeGAiContFact.cxx → AtDetectors/AtDeGAi/AtDeGAiContFact.cxx
diff --git a/AtDeGAi/AtDeGAiContFact.h → AtDetectors/AtDeGAi/AtDeGAiContFact.h b/AtDeGAi/AtDeGAiContFact.h → AtDetectors/AtDeGAi/AtDeGAiContFact.h
diff --git a/AtDeGAi/AtDeGAiCrystalCalData.cxx → ...tectors/AtDeGAi/AtDeGAiCrystalCalData.cxx b/AtDeGAi/AtDeGAiCrystalCalData.cxx → ...tectors/AtDeGAi/AtDeGAiCrystalCalData.cxx
diff --git a/AtDeGAi/AtDeGAiCrystalCalData.h → AtDetectors/AtDeGAi/AtDeGAiCrystalCalData.h b/AtDeGAi/AtDeGAiCrystalCalData.h → AtDetectors/AtDeGAi/AtDeGAiCrystalCalData.h
diff --git a/AtDeGAi/AtDeGAiDigitizer.cxx → AtDetectors/AtDeGAi/AtDeGAiDigitizer.cxx b/AtDeGAi/AtDeGAiDigitizer.cxx → AtDetectors/AtDeGAi/AtDeGAiDigitizer.cxx
diff --git a/AtDeGAi/AtDeGAiDigitizer.h → AtDetectors/AtDeGAi/AtDeGAiDigitizer.h b/AtDeGAi/AtDeGAiDigitizer.h → AtDetectors/AtDeGAi/AtDeGAiDigitizer.h
diff --git a/AtDeGAi/AtDeGAiLinkDef.h → AtDetectors/AtDeGAi/AtDeGAiLinkDef.h b/AtDeGAi/AtDeGAiLinkDef.h → AtDetectors/AtDeGAi/AtDeGAiLinkDef.h
diff --git a/AtField/AtConstField.cxx → AtDetectors/AtField/AtConstField.cxx b/AtField/AtConstField.cxx → AtDetectors/AtField/AtConstField.cxx
diff --git a/AtField/AtConstField.h → AtDetectors/AtField/AtConstField.h b/AtField/AtConstField.h → AtDetectors/AtField/AtConstField.h
diff --git a/AtField/AtFieldCreator.cxx → AtDetectors/AtField/AtFieldCreator.cxx b/AtField/AtFieldCreator.cxx → AtDetectors/AtField/AtFieldCreator.cxx
diff --git a/AtField/AtFieldCreator.h → AtDetectors/AtField/AtFieldCreator.h b/AtField/AtFieldCreator.h → AtDetectors/AtField/AtFieldCreator.h
diff --git a/AtField/FieldLinkDef.h → AtDetectors/AtField/AtFieldLinkDef.h b/AtField/FieldLinkDef.h → AtDetectors/AtField/AtFieldLinkDef.h
diff --git a/AtField/AtFieldPar.cxx → AtDetectors/AtField/AtFieldPar.cxx b/AtField/AtFieldPar.cxx → AtDetectors/AtField/AtFieldPar.cxx
diff --git a/AtField/AtFieldPar.h → AtDetectors/AtField/AtFieldPar.h b/AtField/AtFieldPar.h → AtDetectors/AtField/AtFieldPar.h
diff --git a/AtPassive/.clang-tidy → AtDetectors/AtPassive/.clang-tidy b/AtPassive/.clang-tidy → AtDetectors/AtPassive/.clang-tidy
diff --git a/AtPassive/AtCave.cxx → AtDetectors/AtPassive/AtCave.cxx b/AtPassive/AtCave.cxx → AtDetectors/AtPassive/AtCave.cxx
diff --git a/AtPassive/AtCave.h → AtDetectors/AtPassive/AtCave.h b/AtPassive/AtCave.h → AtDetectors/AtPassive/AtCave.h
diff --git a/AtPassive/AtGeoCave.cxx → AtDetectors/AtPassive/AtGeoCave.cxx b/AtPassive/AtGeoCave.cxx → AtDetectors/AtPassive/AtGeoCave.cxx
diff --git a/AtPassive/AtGeoCave.h → AtDetectors/AtPassive/AtGeoCave.h b/AtPassive/AtGeoCave.h → AtDetectors/AtPassive/AtGeoCave.h
diff --git a/AtPassive/AtMagnet.cxx → AtDetectors/AtPassive/AtMagnet.cxx b/AtPassive/AtMagnet.cxx → AtDetectors/AtPassive/AtMagnet.cxx
diff --git a/AtPassive/AtMagnet.h → AtDetectors/AtPassive/AtMagnet.h b/AtPassive/AtMagnet.h → AtDetectors/AtPassive/AtMagnet.h
diff --git a/AtPassive/AtPassiveContFact.cxx → AtDetectors/AtPassive/AtPassiveContFact.cxx b/AtPassive/AtPassiveContFact.cxx → AtDetectors/AtPassive/AtPassiveContFact.cxx
diff --git a/AtPassive/AtPassiveContFact.h → AtDetectors/AtPassive/AtPassiveContFact.h b/AtPassive/AtPassiveContFact.h → AtDetectors/AtPassive/AtPassiveContFact.h
diff --git a/AtPassive/PassiveLinkDef.h → AtDetectors/AtPassive/AtPassiveLinkDef.h b/AtPassive/PassiveLinkDef.h → AtDetectors/AtPassive/AtPassiveLinkDef.h
diff --git a/AtPassive/AtPipe.cxx → AtDetectors/AtPassive/AtPipe.cxx b/AtPassive/AtPipe.cxx → AtDetectors/AtPassive/AtPipe.cxx
diff --git a/AtPassive/AtPipe.h → AtDetectors/AtPassive/AtPipe.h b/AtPassive/AtPipe.h → AtDetectors/AtPassive/AtPipe.h
diff --git a/AtPxCT/AtPxCT.cxx → AtDetectors/AtPxCT/AtPxCT.cxx b/AtPxCT/AtPxCT.cxx → AtDetectors/AtPxCT/AtPxCT.cxx
diff --git a/AtPxCT/AtPxCT.h → AtDetectors/AtPxCT/AtPxCT.h b/AtPxCT/AtPxCT.h → AtDetectors/AtPxCT/AtPxCT.h
diff --git a/AtPxCT/AtPxCTContFact.cxx → AtDetectors/AtPxCT/AtPxCTContFact.cxx b/AtPxCT/AtPxCTContFact.cxx → AtDetectors/AtPxCT/AtPxCTContFact.cxx
diff --git a/AtPxCT/AtPxCTContFact.h → AtDetectors/AtPxCT/AtPxCTContFact.h b/AtPxCT/AtPxCTContFact.h → AtDetectors/AtPxCT/AtPxCTContFact.h
diff --git a/AtPxCT/AtPxCTCrystalCalData.cxx → AtDetectors/AtPxCT/AtPxCTCrystalCalData.cxx b/AtPxCT/AtPxCTCrystalCalData.cxx → AtDetectors/AtPxCT/AtPxCTCrystalCalData.cxx
diff --git a/AtPxCT/AtPxCTCrystalCalData.h → AtDetectors/AtPxCT/AtPxCTCrystalCalData.h b/AtPxCT/AtPxCTCrystalCalData.h → AtDetectors/AtPxCT/AtPxCTCrystalCalData.h
diff --git a/AtPxCT/AtPxCTDigitizer.cxx → AtDetectors/AtPxCT/AtPxCTDigitizer.cxx b/AtPxCT/AtPxCTDigitizer.cxx → AtDetectors/AtPxCT/AtPxCTDigitizer.cxx
diff --git a/AtPxCT/AtPxCTDigitizer.h → AtDetectors/AtPxCT/AtPxCTDigitizer.h b/AtPxCT/AtPxCTDigitizer.h → AtDetectors/AtPxCT/AtPxCTDigitizer.h
diff --git a/AtPxCT/AtPxCTLinkDef.h → AtDetectors/AtPxCT/AtPxCTLinkDef.h b/AtPxCT/AtPxCTLinkDef.h → AtDetectors/AtPxCT/AtPxCTLinkDef.h
diff --git a/AtSeGA/AtSeGA.cxx → AtDetectors/AtSeGA/AtSeGA.cxx b/AtSeGA/AtSeGA.cxx → AtDetectors/AtSeGA/AtSeGA.cxx
diff --git a/AtSeGA/AtSeGA.h → AtDetectors/AtSeGA/AtSeGA.h b/AtSeGA/AtSeGA.h → AtDetectors/AtSeGA/AtSeGA.h
diff --git a/AtSeGA/AtSeGAContFact.cxx → AtDetectors/AtSeGA/AtSeGAContFact.cxx b/AtSeGA/AtSeGAContFact.cxx → AtDetectors/AtSeGA/AtSeGAContFact.cxx
diff --git a/AtSeGA/AtSeGAContFact.h → AtDetectors/AtSeGA/AtSeGAContFact.h b/AtSeGA/AtSeGAContFact.h → AtDetectors/AtSeGA/AtSeGAContFact.h
diff --git a/AtSeGA/AtSeGACrystalCalData.cxx → AtDetectors/AtSeGA/AtSeGACrystalCalData.cxx b/AtSeGA/AtSeGACrystalCalData.cxx → AtDetectors/AtSeGA/AtSeGACrystalCalData.cxx
diff --git a/AtSeGA/AtSeGACrystalCalData.h → AtDetectors/AtSeGA/AtSeGACrystalCalData.h b/AtSeGA/AtSeGACrystalCalData.h → AtDetectors/AtSeGA/AtSeGACrystalCalData.h
diff --git a/AtSeGA/AtSeGADigitizer.cxx → AtDetectors/AtSeGA/AtSeGADigitizer.cxx b/AtSeGA/AtSeGADigitizer.cxx → AtDetectors/AtSeGA/AtSeGADigitizer.cxx
diff --git a/AtSeGA/AtSeGADigitizer.h → AtDetectors/AtSeGA/AtSeGADigitizer.h b/AtSeGA/AtSeGADigitizer.h → AtDetectors/AtSeGA/AtSeGADigitizer.h
diff --git a/AtSeGA/AtSeGALinkDef.h → AtDetectors/AtSeGA/AtSeGALinkDef.h b/AtSeGA/AtSeGALinkDef.h → AtDetectors/AtSeGA/AtSeGALinkDef.h
diff --git a/AtSiArray/AtSiArray.cxx → AtDetectors/AtSiArray/AtSiArray.cxx b/AtSiArray/AtSiArray.cxx → AtDetectors/AtSiArray/AtSiArray.cxx
diff --git a/AtSiArray/AtSiArray.h → AtDetectors/AtSiArray/AtSiArray.h b/AtSiArray/AtSiArray.h → AtDetectors/AtSiArray/AtSiArray.h
diff --git a/AtSiArray/AtSiArrayContFact.cxx → AtDetectors/AtSiArray/AtSiArrayContFact.cxx b/AtSiArray/AtSiArrayContFact.cxx → AtDetectors/AtSiArray/AtSiArrayContFact.cxx
diff --git a/AtSiArray/AtSiArrayContFact.h → AtDetectors/AtSiArray/AtSiArrayContFact.h b/AtSiArray/AtSiArrayContFact.h → AtDetectors/AtSiArray/AtSiArrayContFact.h
diff --git a/AtSiArray/AtSiArrayGeo.cxx → AtDetectors/AtSiArray/AtSiArrayGeo.cxx b/AtSiArray/AtSiArrayGeo.cxx → AtDetectors/AtSiArray/AtSiArrayGeo.cxx
diff --git a/AtSiArray/AtSiArrayGeo.h → AtDetectors/AtSiArray/AtSiArrayGeo.h b/AtSiArray/AtSiArrayGeo.h → AtDetectors/AtSiArray/AtSiArrayGeo.h
diff --git a/AtSiArray/AtSiArrayGeoPar.cxx → AtDetectors/AtSiArray/AtSiArrayGeoPar.cxx b/AtSiArray/AtSiArrayGeoPar.cxx → AtDetectors/AtSiArray/AtSiArrayGeoPar.cxx
diff --git a/AtSiArray/AtSiArrayGeoPar.h → AtDetectors/AtSiArray/AtSiArrayGeoPar.h b/AtSiArray/AtSiArrayGeoPar.h → AtDetectors/AtSiArray/AtSiArrayGeoPar.h
diff --git a/AtSiArray/AtSiArrayLinkDef.h → AtDetectors/AtSiArray/AtSiArrayLinkDef.h b/AtSiArray/AtSiArrayLinkDef.h → AtDetectors/AtSiArray/AtSiArrayLinkDef.h
diff --git a/AtSiArray/AtSiPoint.cxx → AtDetectors/AtSiArray/AtSiPoint.cxx b/AtSiArray/AtSiPoint.cxx → AtDetectors/AtSiArray/AtSiPoint.cxx
diff --git a/AtSiArray/AtSiPoint.h → AtDetectors/AtSiArray/AtSiPoint.h b/AtSiArray/AtSiPoint.h → AtDetectors/AtSiArray/AtSiPoint.h
diff --git a/AtTpc/AtTpc.cxx → AtDetectors/AtTpc/AtTpc.cxx b/AtTpc/AtTpc.cxx → AtDetectors/AtTpc/AtTpc.cxx
diff --git a/AtTpc/AtTpc.h → AtDetectors/AtTpc/AtTpc.h b/AtTpc/AtTpc.h → AtDetectors/AtTpc/AtTpc.h
diff --git a/AtTpc/AtTpcContFact.cxx → AtDetectors/AtTpc/AtTpcContFact.cxx b/AtTpc/AtTpcContFact.cxx → AtDetectors/AtTpc/AtTpcContFact.cxx
diff --git a/AtTpc/AtTpcContFact.h → AtDetectors/AtTpc/AtTpcContFact.h b/AtTpc/AtTpcContFact.h → AtDetectors/AtTpc/AtTpcContFact.h
diff --git a/AtTpc/AtTpcGeo.cxx → AtDetectors/AtTpc/AtTpcGeo.cxx b/AtTpc/AtTpcGeo.cxx → AtDetectors/AtTpc/AtTpcGeo.cxx
diff --git a/AtTpc/AtTpcGeo.h → AtDetectors/AtTpc/AtTpcGeo.h b/AtTpc/AtTpcGeo.h → AtDetectors/AtTpc/AtTpcGeo.h
diff --git a/AtTpc/AtTpcGeoPar.cxx → AtDetectors/AtTpc/AtTpcGeoPar.cxx b/AtTpc/AtTpcGeoPar.cxx → AtDetectors/AtTpc/AtTpcGeoPar.cxx
diff --git a/AtTpc/AtTpcGeoPar.h → AtDetectors/AtTpc/AtTpcGeoPar.h b/AtTpc/AtTpcGeoPar.h → AtDetectors/AtTpc/AtTpcGeoPar.h
diff --git a/AtDetectors/AtTpc/AtTpcLinkDef.h b/AtDetectors/AtTpc/AtTpcLinkDef.h
@@ -0,0 +1,13 @@
+#ifdef __CINT__
+
+#pragma link off all globals;
+#pragma link off all classes;
+#pragma link off all functions;
+
+#pragma link C++ class AtTpc;
+#pragma link C++ class AtTpcContFact;
+#pragma link C++ class AtTpcGeo;
+#pragma link C++ class AtTpcGeoPar;
+#pragma link C++ class AtTpcPoint;
+
+#endif
diff --git a/AtDetectors/CMakeLists.txt b/AtDetectors/CMakeLists.txt
@@ -0,0 +1,68 @@
+Set(LIBRARY_NAME AtDetectors)
+Set(LINKDEF 
+AtTpc/AtTpcLinkDef.h
+AtPxCT/AtPxCTLinkDef.h
+AtSiArray/AtSiArrayLinkDef.h
+AtSeGA/AtSeGALinkDef.h
+AtDeGAi/AtDeGAiLinkDef.h
+AtApollo/AtApolloLinkDef.h
+AtField/AtFieldLinkDef.h
+AtPassive/AtPassiveLinkDef.h
+)
+
+set(SRCS
+#Put here your sourcefiles
+AtTpc/AtTpc.cxx
+AtTpc/AtTpcContFact.cxx
+AtTpc/AtTpcGeo.cxx
+AtTpc/AtTpcGeoPar.cxx
+
+AtPxCT/AtPxCT.cxx
+AtPxCT/AtPxCTContFact.cxx
+AtPxCT/AtPxCTCrystalCalData.cxx
+AtPxCT/AtPxCTDigitizer.cxx
+
+AtSiArray/AtSiArrayContFact.cxx
+AtSiArray/AtSiArrayGeo.cxx
+AtSiArray/AtSiArrayGeoPar.cxx
+AtSiArray/AtSiArray.cxx
+AtSiArray/AtSiPoint.cxx
+
+AtSeGA/AtSeGA.cxx
+AtSeGA/AtSeGAContFact.cxx
+AtSeGA/AtSeGACrystalCalData.cxx
+AtSeGA/AtSeGADigitizer.cxx
+
+AtDeGAi/AtDeGAi.cxx
+AtDeGAi/AtDeGAiContFact.cxx
+AtDeGAi/AtDeGAiCrystalCalData.cxx
+AtDeGAi/AtDeGAiDigitizer.cxx
+
+AtApollo/AtApollo.cxx
+AtApollo/AtApolloContFact.cxx
+AtApollo/AtApolloPoint.cxx
+AtApollo/AtApolloCrystalCalData.cxx
+AtApollo/AtApolloDigitizer.cxx
+
+AtField/AtConstField.cxx   
+AtField/AtFieldCreator.cxx 
+AtField/AtFieldPar.cxx
+
+AtPassive/AtCave.cxx           
+AtPassive/AtPipe.cxx 
+AtPassive/AtGeoCave.cxx        
+AtPassive/AtMagnet.cxx         
+AtPassive/AtPassiveContFact.cxx
+)
+
+Set(DEPENDENCIES
+  FairRoot::Base
+  ROOT::Core
+  ATTPCROOT::AtSimulationData
+  )
+
+generate_target_and_root_library(${LIBRARY_NAME}
+  LINKDEF ${LINKDEF}
+  SRCS ${SRCS}
+  DEPS_PUBLIC ${DEPENDENCIES}
+  )
diff --git a/AtField/CMakeLists.txt b/AtField/CMakeLists.txt
diff --git a/AtPassive/CMakeLists.txt b/AtPassive/CMakeLists.txt
diff --git a/AtPxCT/CMakeLists.txt b/AtPxCT/CMakeLists.txt
diff --git a/AtSeGA/CMakeLists.txt b/AtSeGA/CMakeLists.txt
diff --git a/AtSiArray/CMakeLists.txt b/AtSiArray/CMakeLists.txt
diff --git a/AtSimulationData/AtDetectorList.h b/AtSimulationData/AtDetectorList.h
@@ -23,6 +23,7 @@ enum DetectorId {
    kAtApollo,
    kAtSeGA,
    kAtDeGAi,
+   kAtPxCT,
    kSTOPHERE,
 };
 

diff --git a/AtTpc/AtTpcLinkDef.h b/AtTpc/AtTpcLinkDef.h
diff --git a/AtTpc/CMakeLists.txt b/AtTpc/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -156,23 +156,18 @@ add_subdirectory (AtSimulationData)
 add_subdirectory (AtData)
 add_subdirectory (AtUnpack)
 add_subdirectory (AtGenerators)
-add_subdirectory (AtTpc)
-add_subdirectory (AtSiArray)
+add_subdirectory (AtDetectors)
 
-add_subdirectory (AtPassive)
-add_subdirectory (AtField)
 add_subdirectory (AtMap)
 add_subdirectory (AtReconstruction)
 add_subdirectory (AtParameter)
 add_subdirectory (AtDigitization)
 add_subdirectory (AtS800)
-add_subdirectory (AtApollo)
-add_subdirectory (AtSeGA)
-add_subdirectory (AtDeGAi)
 add_subdirectory (AtAnalysis)
 add_subdirectory (AtTools)
 add_subdirectory (AtEventDisplay)
 
+
 if(BUILD_TESTS)
   include(ATTPCRootCTest)
 endif(BUILD_TESTS)