updates in TRD

[u/mrichter/AliRoot.git] / PWG1 / CalibMacros / Pass0 / makeOCDB.C

diff --git a/PWG1/CalibMacros/Pass0/makeOCDB.C b/PWG1/CalibMacros/Pass0/makeOCDB.C
index d8ee5dfa2cc693fe5e78a52546281aaa67e47e5c..4451fb45581cc08b39154365ca52149b5afe7307 100644 (file)
--- a/PWG1/CalibMacros/Pass0/makeOCDB.C
+++ b/PWG1/CalibMacros/Pass0/makeOCDB.C
@@ -10,8 +10,6 @@
 
 */
 
-const AliTRDCalDet *GetCalDetVdrift(Int_t runNumber, Int_t version, Int_t subversion);
-
 void makeOCDB(TString runNumberString, TString  ocdbStorage="")
 {
   //
@@ -42,6 +40,7 @@ void makeOCDB(TString runNumberString, TString  ocdbStorage="")
   AliTPCPreprocessorOffline proces;
 
   // switch on parameter validation
+  proces.SetTimeGainRange(0.5,3.0);
   proces.SwitchOnValidation();
 
   // Make timegain calibration
@@ -57,50 +56,43 @@ void makeOCDB(TString runNumberString, TString  ocdbStorage="")
   AliTOFAnalysisTaskCalibPass0 calibTask;
   Printf("Calibrating TOF");
   calibTask.ProcessOutput("CalibObjects.root", ocdbStorage);
-
-
-  //TRD part
-  AliTRDPreprocessorOffline procestrd;
-  procestrd.SetLinearFitForVdrift(kTRUE);
-  procestrd.Init("CalibObjects.root");
-  Int_t versionVdriftUsed = procestrd.GetVersionVdriftUsed();
-  Int_t subversionVdriftUsed = procestrd.GetSubVersionVdriftUsed();
-  if(versionVdriftUsed != 0) {
-
-    AliTRDCalDet *caldet =GetCalDetVdrift(runNumber,versionVdriftUsed,subversionVdriftUsed);
-    procestrd.SetCalDetVdrift(caldet);
-
-    if(caldet) {
-
-      procestrd.SetMinStatsVdriftT0PH(600*10);
-      procestrd.SetMinStatsVdriftLinear(60);
-      procestrd.SetMinStatsGain(600);
-
-      procestrd.CalibVdriftT0("CalibObjects.root",runNumber,runNumber,ocdbStorage);
-      procestrd.CalibGain("CalibObjects.root",runNumber,runNumber,ocdbStorage);
-      procestrd.CalibChamberStatus(runNumber,runNumber,ocdbStorage);
-    }
-  }
+//
+//
+
+// T0 part
+  AliT0PreprocessorOffline procesT0;
+  // Make  calibration of channels offset
+   procesT0.Process("CalibObjects.root",runNumber, runNumber, ocdbStorage);
+
+
+
+   //TRD part
+   AliTRDPreprocessorOffline procestrd;
+   procestrd.SetLinearFitForVdrift(kTRUE);
+   procestrd.SetMinStatsVdriftT0PH(600*10);
+   procestrd.SetMinStatsVdriftLinear(50);
+   procestrd.SetMinStatsGain(600);
+   procestrd.SetLimitValidateNoData(40);
+   procestrd.SetLimitValidateBadCalib(40);
+   procestrd.SetAlternativeDriftVelocityFit(kTRUE);
+   procestrd.Init("CalibObjects.root");
+   Int_t versionVdriftUsed = procestrd.GetVersionVdriftUsed();
+   Int_t subversionVdriftUsed = procestrd.GetSubVersionVdriftUsed();
+   Int_t versionGainUsed = procestrd.GetVersionGainUsed();
+   Int_t subversionGainUsed = procestrd.GetSubVersionGainUsed();
+   Int_t versionExBUsed = procestrd.GetVersionExBUsed();
+   Int_t subversionExBUsed = procestrd.GetSubVersionExBUsed();
+   printf("version and subversion vdrift %d and %d\n",versionVdriftUsed,subversionVdriftUsed);
+   printf("version and subversion gain %d and %d\n",versionGainUsed,subversionGainUsed);
+   printf("version and subversion exb %d and %d\n",versionExBUsed,subversionExBUsed);
+   procestrd.Process("CalibObjects.root",runNumber,runNumber,ocdbStorage);
+   Int_t trdstatus = procestrd.GetStatus();
+  
+  
+  //Mean Vertex
+  AliMeanVertexPreprocessorOffline procesMeanVtx;
+  procesMeanVtx.ProcessOutput("CalibObjects.root", ocdbStorage, runNumber);
+       
   return;
 }
 
-const AliTRDCalDet *GetCalDetVdrift(Int_t runNumber, Int_t version, Int_t subversion){
-  //
-  // Get Cal Det used during reconstruction for vdrift
-  //
-
-
-  AliCDBEntry *entry = AliCDBManager::Instance()->Get("TRD/Calib/ChamberVdrift",runNumber, version, subversion);
-  if(!entry) {
-    printf("Found no entry\n");
-    return 0x0;
-  }
-  const AliCDBId id = entry->GetId();
-  version = id.GetVersion();
-  subversion = id.GetSubVersion();
-  //printf("Found version %d and subversion %d for vdrift\n",version,subversion);
-  const AliTRDCalDet* calDet = (AliTRDCalDet *)entry->GetObject();
-
-  return calDet;
-
-}