* preparing TiaraBarrelPhysics

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;
 
 }

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);

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();
     }
   }
 }