-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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]>
- Loading branch information
Showing
92 changed files
with
124 additions
and
285 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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} | ||
) |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -23,6 +23,7 @@ enum DetectorId { | |
kAtApollo, | ||
kAtSeGA, | ||
kAtDeGAi, | ||
kAtPxCT, | ||
kSTOPHERE, | ||
}; | ||
|
||
|
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.