diff --git a/Inputs/DetectorConfiguration/e628.detector b/Inputs/DetectorConfiguration/e628.detector index 7074c4815f16c4feb69439bb1558732e298491ec..dc070a5ddf1aab1420710c09942820bfb0efeb9a 100644 --- a/Inputs/DetectorConfiguration/e628.detector +++ b/Inputs/DetectorConfiguration/e628.detector @@ -66,24 +66,31 @@ TiaraHyball TiaraHyballWedge Z= -147 R= 0 - PHI= 0 + Phi= 0 TiaraHyballWedge Z= -147 R= 0 - PHI= 60 + Phi= 60 TiaraHyballWedge Z= -147 R= 0 - PHI= 120 + Phi= 120 TiaraHyballWedge Z= -147 R= 0 - PHI= 180 + Phi= 180 TiaraHyballWedge Z= -147 R= 0 - PHI= 240 + Phi= 240 TiaraHyballWedge Z= -147 R= 0 - PHI= 300 + Phi= 300 +%%%%%%%%%%%%%%%%%%%%%%%%%%% +TiaraBarrel + X= 0 + Y= 0 + Z= 0 + OuterBarrel= 1 + InnerBarrel= 1 diff --git a/NPLib/Tiara/Makefile b/NPLib/Tiara/Makefile index 77ceaf0ecc31487522754775f95901118a9585c0..0aaaf9b65d4ac227bb348123b5c156ff6d262d1d 100644 --- a/NPLib/Tiara/Makefile +++ b/NPLib/Tiara/Makefile @@ -9,13 +9,16 @@ all: $(SHARELIB) ############### Detector ############## ## Sharc ## -libTiara.so: TTiaraBarrelData.o TTiaraBarrelDataDict.o TTiaraHyballData.o TTiaraHyballDataDict.o TTiaraHyballPhysics.o TTiaraHyballPhysicsDict.o TTiaraHyballSpectra.o +libTiara.so: TTiaraBarrelData.o TTiaraBarrelDataDict.o TTiaraBarrelPhysics.o TTiaraBarrelPhysicsDict.o TTiaraHyballData.o TTiaraHyballDataDict.o TTiaraHyballPhysics.o TTiaraHyballPhysicsDict.o TTiaraHyballSpectra.o $(LD) $(SOFLAGS) $^ $(OutPutOpt) $@ TTiaraBarrelDataDict.cxx: TTiaraBarrelData.h rootcint -f $@ -c $^ +TTiaraBarrelPhysicsDict.cxx: TTiaraBarrelPhysics.h + rootcint -f $@ -c $^ + TTiaraHyballDataDict.cxx: TTiaraHyballData.h rootcint -f $@ -c $^ diff --git a/NPLib/Tiara/TTiaraHyballPhysics.cxx b/NPLib/Tiara/TTiaraHyballPhysics.cxx index e2d5f0f9b743ae82a3dea62a9be5972c64242326..42e165b9c62e431ff5265696964ba22cfe2b3b79 100644 --- a/NPLib/Tiara/TTiaraHyballPhysics.cxx +++ b/NPLib/Tiara/TTiaraHyballPhysics.cxx @@ -422,7 +422,7 @@ void TTiaraHyballPhysics::ReadConfiguration(string Path){ getline(ConfigFile, LineBuffer); // cout << LineBuffer << endl; - if (LineBuffer.compare(0, 5, "TiaraHyball") == 0) + if (LineBuffer.compare(0, 11, "TiaraHyball") == 0) ReadingStatus = true; while (ReadingStatus && !ConfigFile.eof()) { diff --git a/NPLib/VDetector/DetectorManager.cxx b/NPLib/VDetector/DetectorManager.cxx index 232ffd148336e6bb4402c48faa1b6b8579c86d07..e59c2f23a8fababdce1a747b7b807d73ca085e75 100644 --- a/NPLib/VDetector/DetectorManager.cxx +++ b/NPLib/VDetector/DetectorManager.cxx @@ -38,6 +38,7 @@ #include "TPlasticPhysics.h" #include "TTrifoilPhysics.h" #include "TTiaraHyballPhysics.h" +#include "TTiaraBarrelPhysics.h" #include "TChateauCristalPhysics.h" #include "GaspardTracker.h" #include "Hyde2Tracker.h" @@ -95,7 +96,8 @@ void DetectorManager::ReadConfigurationFile(string Path) { Bool_t EXL = false; Bool_t TAC = false; Bool_t TiaraHyball = false; - ////////////////////////////////////////////////////////////////////////////////////////// + Bool_t TiaraBarrel = false; +////////////////////////////////////////////////////////////////////////////////////////// string GlobalPath = getenv("NPTOOL"); string StandardPath = GlobalPath + "/Inputs/DetectorConfiguration/" + Path; ifstream ConfigFile; @@ -528,6 +530,26 @@ void DetectorManager::ReadConfigurationFile(string Path) { AddDetector("TiaraHyball", myDetector); #endif } + + //////////////////////////////////////////// + ///////// Search for Tiara barrel ////////// + //////////////////////////////////////////// + else if (LineBuffer.compare(0, 11, "TiaraBarrel") == 0 && TiaraBarrel == false) { +#ifdef INC_TIARA + TiaraBarrel = true; + cout << "//////// Tiara Barrel ////////" << endl << endl; + + // Instantiate the new array as a VDetector Object + VDetector* myDetector = new TTiaraBarrelPhysics(); + // Read Position of Telescope + ConfigFile.close(); + myDetector->ReadConfiguration(Path); + ConfigFile.open(Path.c_str()); + + // Add array to the VDetector Vector + AddDetector("TiaraBarrel", myDetector); +#endif + } //////////////////////////////////////////// //////////// Search for Target ///////////// ////////////////////////////////////////////