diff --git a/NPLib/Tiara/TTiaraBarrelPhysics.cxx b/NPLib/Tiara/TTiaraBarrelPhysics.cxx index 729337c1f3f3f1de55349240292cd40667871d14..f6dc148213816ea4457627e965756765f67bcf3f 100644 --- a/NPLib/Tiara/TTiaraBarrelPhysics.cxx +++ b/NPLib/Tiara/TTiaraBarrelPhysics.cxx @@ -128,6 +128,9 @@ void TTiaraBarrelPhysics::PreTreat(){ ClearPreTreatedData(); // Match Stick Calibration // Gain Calibration + + + // Position // Ballistic Deficit correction } @@ -455,17 +458,25 @@ map< vector<TString>,TH1* > TTiaraBarrelPhysics::GetSpectra() { void TTiaraBarrelPhysics::AddParameterToCalibrationManager(){ CalibrationManager* Cal = CalibrationManager::getInstance(); + + // E and T for(int i = 0 ; i < m_NumberOfDetector ; ++i){ - for( int j = 0 ; j < 24 ; ++j){ - Cal->AddParameter("TIARABARREL", "D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_E","TIARABARREL_D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_E") ; - Cal->AddParameter("TIARABARREL", "D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_T","TIARABARREL_D"+itoa(i+1)+"_STRIP_RING"+itoa(j+1)+"_T") ; + for( int j = 0 ; j < 4 ; ++j){ + Cal->AddParameter("TIARABARREL_B", itoa(i+1)+"_UPSTREAM"+itoa(j+1)+"_E","TIARABARREL_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_E") ; + Cal->AddParameter("TIARABARREL_B", itoa(i+1)+"_UPSTREAM"+itoa(j+1)+"_T","TIARABARREL_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_T") ; + Cal->AddParameter("TIARABARREL_B", itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_E","TIARABARREL_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_E") ; + Cal->AddParameter("TIARABARREL_B", itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_T","TIARABARREL_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_T") ; } - - for( int j = 0 ; j < 48 ; ++j){ - Cal->AddParameter("TIARABARREL", "D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_E","TIARABARREL_D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_E") ; - Cal->AddParameter("TIARABARREL", "D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_T","TIARABARREL_D"+itoa(i+1)+"_STRIP_SECTOR"+itoa(j+1)+"_T") ; + } + + // POS + for(int i = 0 ; i < m_NumberOfDetector ; ++i){ + for( int j = 0 ; j < 4 ; ++j){ + Cal->AddParameter("TIARABARREL_B", itoa(i+1)+"_UPSTREAM"+itoa(j+1)+"_POS","TIARABARREL_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_POS") ; + Cal->AddParameter("TIARABARREL_B", itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_POS","TIARABARREL_B"+itoa(i+1)+"_DOWNSTREAM"+itoa(j+1)+"_POS") ; } } + return; } diff --git a/NPLib/Tiara/TTiaraBarrelSpectra.cxx b/NPLib/Tiara/TTiaraBarrelSpectra.cxx index 9fb41e0737dc0903e44a99beae6923ebc3b5904c..372ef804d67559fa09b0b3e03e0e5d2e4d89d18f 100644 --- a/NPLib/Tiara/TTiaraBarrelSpectra.cxx +++ b/NPLib/Tiara/TTiaraBarrelSpectra.cxx @@ -189,7 +189,7 @@ void TTiaraBarrelSpectra::FillRawSpectra(TTiaraBarrelData* RawData){ +RawData->GetOuterEStripNbr(i),RawData->GetOuterEEnergy(i)); } - // INNER_BARREL_VS_RAW + // INNER_BARREL_VS_RAW family = BaseFamily+"VS"; for (unsigned int i = 0; i < RawData->GetFrontUpstreamEMult(); i++) { int UpStreamDetNbr = RawData->GetFrontUpstreamEDetectorNbr(i); diff --git a/NPLib/VDetector/DetectorManager.cxx b/NPLib/VDetector/DetectorManager.cxx index 50253459b1f1a4aab3080ef5382b69b2efd10a0f..6b9518885a62dc4e5d672d286e594760bca4fea5 100644 --- a/NPLib/VDetector/DetectorManager.cxx +++ b/NPLib/VDetector/DetectorManager.cxx @@ -669,6 +669,7 @@ void DetectorManager::BuildPhysicalEvent(){ ///////////////////////////////////////////////////////////////////////////////////////////////// void DetectorManager::BuildSimplePhysicalEvent(){ + map<string,VDetector*>::iterator it; for (it = m_Detector.begin(); it != m_Detector.end(); ++it) { @@ -676,7 +677,7 @@ void DetectorManager::BuildSimplePhysicalEvent(){ if(NPOptionManager::getInstance()->GetGenerateHistoOption()){ it->second->FillSpectra(); if(NPOptionManager::getInstance()->GetCheckHistoOption()) - it->second->CheckSpectra(); + it->second->CheckSpectra(); } } }