diff --git a/NPAnalysis/macros/GeometricalEfficiency.C b/NPAnalysis/macros/GeometricalEfficiency.C index 1509e128fc15125aee42daca2cd9687412b50be8..06ed0c12276d199884a528f25e83bc14de7cb2cc 100644 --- a/NPAnalysis/macros/GeometricalEfficiency.C +++ b/NPAnalysis/macros/GeometricalEfficiency.C @@ -98,4 +98,4 @@ void GeometricalEfficiency(const char * fname = "myResult"){ SolidACM->GetXaxis()->SetTitle("#theta_{CM} (deg)"); SolidACM->GetYaxis()->SetTitle("d#Omega (sr) "); c4->Update(); - +} diff --git a/NPLib/VDetector/DetectorManager.cxx b/NPLib/VDetector/DetectorManager.cxx index b9b5ed31bea46d4d680838cde09d13aff1104fd0..9027d06d8fd2da6b6608e18046b1cb2fc68be038 100644 --- a/NPLib/VDetector/DetectorManager.cxx +++ b/NPLib/VDetector/DetectorManager.cxx @@ -106,6 +106,7 @@ void DetectorManager::ReadConfigurationFile(string Path) { bool TiaraBarrel = false; bool TiaraHyball = false; bool Trifoil = false; + bool Tigress = false; bool W1 = false; //////////////////////////////// bool GeneralTarget = false; @@ -637,6 +638,26 @@ void DetectorManager::ReadConfigurationFile(string Path) { #endif } + //////////////////////////////////////////// + ///////////// Search for Tigress /////////// + //////////////////////////////////////////// + else if (LineBuffer.compare(0, 7, "Tigress") == 0 && Tigress == false) { +#ifdef INC_TIGRESS + Tigress = true; + cout << "//////// Tigress ////////" << endl << endl; + + // Instantiate the new array as a VDetector Object + VDetector* myDetector = new TTigressPhysics(); + // Read Position of Telescope + ConfigFile.close(); + myDetector->ReadConfiguration(Path); + ConfigFile.open(Path.c_str()); + + // Add array to the VDetector Vector + AddDetector("Tigress", myDetector); +#endif + } + //////////////////////////////////////////// ////////// Search for W1 (Micron) ///////// ////////////////////////////////////////////