X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=T0%2FAliT0PreprocessorOffline.cxx;h=94a614c204db42bd884f4d8c01a08e7121b61dd4;hb=b3fc70e99c888f1b2f25d5e930ab8bccb5900de4;hp=0a7d93553eca15a6c0f1184053aae7458884e269;hpb=b0ab3f59d40d4dee6496c0430035c7aef032b83f;p=u%2Fmrichter%2FAliRoot.git

diff --git a/T0/AliT0PreprocessorOffline.cxx b/T0/AliT0PreprocessorOffline.cxx
index 0a7d93553ec..94a614c204d 100644
--- a/T0/AliT0PreprocessorOffline.cxx
+++ b/T0/AliT0PreprocessorOffline.cxx
@@ -46,12 +46,11 @@ ClassImp(AliT0PreprocessorOffline)
 //____________________________________________________
 AliT0PreprocessorOffline::AliT0PreprocessorOffline():
 TNamed("AliT0PreprocessorOffline","AliT0PreprocessorOffline"),
-  startRun(0),                         // start Run - used to make fast selection in THnSparse
-  endRun(0),                           // end   Run - used to make fast selection in THnSparse
-  startTime(0),                        // startTime - used to make fast selection in THnSparse
-  endTime(0),                          // endTime   - used to make fast selection in THnSparse
-  ocdbStorage("")                  // path to the OCDB storage
-  
+  startRun(0),      
+  endRun(0),  
+  startTime(0),    
+  endTime(0),     
+  ocdbStorage("")  
 {
   //constructor
 }
@@ -65,7 +64,7 @@ AliT0PreprocessorOffline::~AliT0PreprocessorOffline()
 //____________________________________________________
 void AliT0PreprocessorOffline::Process(TString filePhysName, Int_t ustartRun, Int_t uendRun, TString pocdbStorage)
 {
-  //  CalibOffsetChannels(filePhysName, ustartRun, uendRun, pocdbStorage);
+  CalibOffsetChannels(filePhysName, ustartRun, uendRun, pocdbStorage);
   CalibT0sPosition(filePhysName, ustartRun, uendRun, pocdbStorage);
 }
 //____________________________________________________
@@ -82,24 +81,7 @@ void AliT0PreprocessorOffline::CalibOffsetChannels(TString filePhysName, Int_t u
   if (pocdbStorage.Length()>0) ocdbStorage=pocdbStorage;
   else
     ocdbStorage="local://"+gSystem->GetFromPipe("pwd")+"/OCDB";
-  AliCDBEntry *entry = AliCDBManager::Instance()->Get("GRP/CTP/CTPtiming");
-  if (!entry) AliFatal("CTP timing parameters are not found in OCDB !");
-  AliCTPTimeParams *ctpParams = (AliCTPTimeParams*)entry->GetObject();
-  Float_t l1Delay = (Float_t)ctpParams->GetDelayL1L0()*25.0;
-  
-  AliCDBEntry *entry1 = AliCDBManager::Instance()->Get("GRP/CTP/TimeAlign");
-  if (!entry1) AliFatal("CTP time-alignment is not found in OCDB !");
-  AliCTPTimeParams *ctpTimeAlign = (AliCTPTimeParams*)entry1->GetObject();
-  l1Delay += ((Float_t)ctpTimeAlign->GetDelayL1L0()*25.0);
-  
-  AliCDBEntry *entry4 = AliCDBManager::Instance()->Get("GRP/Calib/LHCClockPhase");
-  if (!entry4) AliFatal("LHC clock-phase shift is not found in OCDB !");
-  AliLHCClockPhase *phase = (AliLHCClockPhase*)entry4->GetObject();
-  Float_t fGRPdelays = l1Delay - phase->GetMeanPhase();
-  AliCDBEntry *entryL = AliCDBManager::Instance()->Get("T0/Calib/Latency");
-  AliT0CalibLatency *lat = (AliT0CalibLatency*)entryL->GetObject();
-  Float_t fLatencyHPTDC = lat->GetLatencyHPTDC();
-  Float_t fLatencyL1 = lat->GetLatencyL1();
+ 
   AliCDBEntry *entryCalib = AliCDBManager::Instance()->Get("T0/Calib/TimeDelay");
   if(!entryCalib) {
     AliWarning(Form("Cannot find any AliCDBEntry for [Calib, TimeDelay]!"));
@@ -109,17 +91,13 @@ void AliT0PreprocessorOffline::CalibOffsetChannels(TString filePhysName, Int_t u
       AliT0CalibTimeEq *clb = (AliT0CalibTimeEq*)entryCalib->GetObject();
        timecdb = clb->GetTimeEq();
        cfdvalue = clb->GetCFDvalue();
-       for (Int_t i=0; i<24; i++) {
-	 if( cfdvalue[i] < 500 ) cfdvalue[i] =( 1000.*fLatencyHPTDC - 1000.*fLatencyL1 + 1000.*fGRPdelays)/24.4;
-	 printf("Calc  mean CFD time %i %f \n",i,cfdvalue[i]);
-       }
     }
-  AliCDBEntry *entryCalibreco = AliCDBManager::Instance()->Get("T0/Calib/RecoParam");
-  if(entryCalibreco) {
-    AliT0RecoParam *rpr = (AliT0RecoParam*) entryCalibreco->GetObject();
-    badpmt = rpr->GetRefPoint();
-    printf(" bad PMT %i \n", badpmt);
-  }
+  //AliCDBEntry *entryCalibreco = AliCDBManager::Instance()->Get("T0/Calib/RecoParam");
+  //  if(entryCalibreco) {
+  //  AliT0RecoParam *rpr = (AliT0RecoParam*) entryCalibreco->GetObject();
+    //    badpmt = rpr->GetRefPoint();
+  badpmt = -1;
+  // }
   AliT0CalibTimeEq *offline = new AliT0CalibTimeEq();
   Bool_t writeok = offline->ComputeOfflineParams(filePhysName.Data(), timecdb, cfdvalue, badpmt);
   AliCDBMetaData metaData;
@@ -168,9 +146,9 @@ void AliT0PreprocessorOffline::CalibT0sPosition(TString filePhysName, Int_t usta
   
   if (writeok)  {
     AliCDBId* id1=NULL;
-	id1=new AliCDBId("T0/Calib/TimeAdjust", ustartRun, uendRun);
-	AliCDBStorage* gStorage = AliCDBManager::Instance()->GetStorage(ocdbStorage);
-	gStorage->Put(offline, (*id1), &metaData);
+    id1=new AliCDBId("T0/Calib/TimeAdjust", ustartRun, uendRun);
+    AliCDBStorage* gStorage = AliCDBManager::Instance()->GetStorage(ocdbStorage);
+    gStorage->Put(offline, (*id1), &metaData);
   }
 
 }