diff --git a/NPLib/VDetector/DetectorManager.cxx b/NPLib/VDetector/DetectorManager.cxx index d3954a3aee08beda802d6e8f6bbb7e31ce911c1d..5a0405451804a6e62388e2a4036057d4a6a4a04b 100644 --- a/NPLib/VDetector/DetectorManager.cxx +++ b/NPLib/VDetector/DetectorManager.cxx @@ -10,6 +10,7 @@ #include "TMust2Physics.h" #include "TCATSPhysics.h" #include "TSSSDPhysics.h" +#include "TExogamPhysics.h" #include "TPlasticPhysics.h" #include "TTrifoilPhysics.h" #include "GaspardTracker.h" @@ -55,6 +56,7 @@ void DetectorManager::ReadConfigurationFile(string Path) bool MUST2 = false; bool CATS = false; bool SSSD = false; + bool Exogam = false; bool ScintillatorPlastic = false; bool Trifoil = false; bool GeneralTarget = false; @@ -261,6 +263,27 @@ void DetectorManager::ReadConfigurationFile(string Path) #endif } + ////////////////////////////////////////////// + ////////// Search for Exogam ///////// + ////////////////////////////////////////////// + else if (LineBuffer.compare(0, 11, "EXOGAMArray") == 0 && Exogam == false) { +#ifdef EXOGAM + Exogam = true ; + cout << "//////// Exogam ////////" << endl << endl; + + // Instantiate the new array as a VDetector Object + VDetector* myDetector = new TExogamPhysics(); + + // Read Position of Telescope + ConfigFile.close(); + myDetector->ReadConfiguration(Path); + ConfigFile.open(Path.c_str()); + + // Add array to the VDetector Vector + AddDetector("EXOGAM", myDetector); +#endif + } + //////////////////////////////////////////// ///////////// Search for Plastic /////////// //////////////////////////////////////////// diff --git a/NPLib/configure b/NPLib/configure index 3076a6ea2c90d43183d55205cba255fad3468311..71be2b918fdff2cd60bc9fbae7c206587453860f 100755 --- a/NPLib/configure +++ b/NPLib/configure @@ -72,8 +72,6 @@ do if [ $# = 0 ] ; then detector_string="$detector_string""$lname " else - # only add Makefile.detector target if it is in the - # arguments list if echo "$args" | grep -q "$lname" ; then detector_string="$detector_string""$lname " fi ;