diff --git a/NPLib/VDetector/DetectorManager.cxx b/NPLib/VDetector/DetectorManager.cxx index 3bc772a6fcce5927e0e7e04270a7d6e244fa2786..f99e8d86ba40f95ff844190d162703c348710f05 100644 --- a/NPLib/VDetector/DetectorManager.cxx +++ b/NPLib/VDetector/DetectorManager.cxx @@ -36,7 +36,6 @@ #include "TTrifoilPhysics.h" #include "TChateauCristalPhysics.h" #include "GaspardTracker.h" -#include "HydeTracker.h" #include "Hyde2Tracker.h" #include "Paris.h" #include "TW1Physics.h" @@ -88,7 +87,6 @@ void DetectorManager::ReadConfigurationFile(string Path) Bool_t Trifoil = false; Bool_t GeneralTarget = false; Bool_t GPDTracker = false; - Bool_t HYDTracker = false; Bool_t HYD2Tracker = false; Bool_t ParisDet = false; Bool_t ShieldDet = false; @@ -149,27 +147,7 @@ void DetectorManager::ReadConfigurationFile(string Path) #endif } //////////////////////////////////////////// - //////////// Search for Hyde //////////// - //////////////////////////////////////////// - else if (LineBuffer.compare(0, 11, "HydeTracker") == 0 && HYDTracker == false) { -#ifdef INC_HYDE - HYDTracker = true ; - cout << "//////// Hyde Tracker ////////" << endl; - - // Instantiate the new array as a VDetector Object - VDetector* myDetector = new HydeTracker(); - - // Read Position of Telescope - ConfigFile.close(); - myDetector->ReadConfiguration(Path); - ConfigFile.open(Path.c_str()); - - // Add array to the VDetector Vector - AddDetector("HYDE", myDetector); -#endif - } - //////////////////////////////////////////// - //////////// Search for Hyde //////////// + //////////// Search for Hyde2 /////////// //////////////////////////////////////////// else if (LineBuffer.compare(0, 12, "Hyde2Tracker") == 0 && HYD2Tracker == false) { #ifdef INC_HYDE2 diff --git a/NPSimulation/src/DetectorConstruction.cc b/NPSimulation/src/DetectorConstruction.cc index ca89e5848d7a73978749e630700f065dd911a499..65fbd8cff1f0df4d2d17e1efc3a3bea46121bdf6 100644 --- a/NPSimulation/src/DetectorConstruction.cc +++ b/NPSimulation/src/DetectorConstruction.cc @@ -55,7 +55,6 @@ #include "Eurogam.hh" #include "GaspardTracker.hh" #include "Helios.hh" -#include "HydeTracker.hh" #include "Hyde2Tracker.hh" #include "MUST2Array.hh" #include "Paris.hh" @@ -182,7 +181,6 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ bool cGeneralTarget = false; bool cGeneralChamber = false; bool cGPDTracker = false; - bool cHYDTracker = false; bool cHYD2Tracker = false; bool cMUST2 = false; bool cPlastic = false; @@ -297,28 +295,6 @@ void DetectorConstruction::ReadConfigurationFile(string Path){ } - //////////////////////////////////////////// - //////////// Search for Hyde //////////// - //////////////////////////////////////////// - else if (LineBuffer.compare(0, 11, "HydeTracker") == 0 && cHYDTracker == false) { -#ifdef INC_HYDE - cHYDTracker = true ; - if(VerboseLevel==1) cout << endl << "//////// Hyde Tracker ////////" << endl ; - - // Instantiate the new array as a VDetector Object - VDetector* myDetector = new HydeTracker() ; - - // Read Position of Telescope - ConfigFile.close() ; - myDetector->ReadConfiguration(Path) ; - ConfigFile.open(Path.c_str()) ; - - // Add array to the VDetector Vector - AddDetector(myDetector) ; -#endif - } - - //////////////////////////////////////////// //////////// Search for Hyde2 //////////// ////////////////////////////////////////////