Merge branch 'master', remote branch 'origin' into TPCdev

[u/mrichter/AliRoot.git] / PWGPP / CalibMacros / CPass1 / runCalibTrain.C

diff --git a/PWGPP/CalibMacros/CPass1/runCalibTrain.C b/PWGPP/CalibMacros/CPass1/runCalibTrain.C
index bbed8e4e08fd980f942475cfa0e95e4c10a436dc..58daa1540feb2acb51b7806ec0c8e789c51eee9d 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/runCalibTrain.C
+++ b/PWGPP/CalibMacros/CPass1/runCalibTrain.C
@@ -11,7 +11,7 @@
   runCalibTrain("104892");
 */
 
-void runCalibTrain(TString runNumberString, const char *inFileName = "AliESDs.root", const char *ocdb="raw://")
+void runCalibTrain(Int_t runNumber, const char *inFileName = "AliESDs.root", const char *ocdb="raw://")
 {
   //
   // macro to run TPC calibration train 
@@ -37,7 +37,6 @@ void runCalibTrain(TString runNumberString, const char *inFileName = "AliESDs.ro
 
   // config calibration train
   // setting geometry and B-field from GRP
-  Int_t runNumber = runNumberString.Atoi();
   printf("runNumber from runCalibTrain = %d\n",runNumber);
   printf("ocdb from runCalibTrain = %s\n",ocdb);
   ConfigCalibTrain(runNumber, ocdb);
@@ -76,14 +75,14 @@ void runCalibTrain(TString runNumberString, const char *inFileName = "AliESDs.ro
   // Detector Tasks
   //
   if ( detStr.Contains("TPC"))  AddTaskTPCCalib(runNumber);
-  if ( detStr.Contains("TRD"))  AddTaskTRDCalib(runNumber);
-  if ( detStr.Contains("TOF"))  AddTOFAnalysisTaskCalibPass0();
+  if ( detStr.Contains("TRD") && detStr.Contains("TPC"))  AddTaskTRDCalib(runNumber);
+  if ( detStr.Contains("TOF") && detStr.Contains("TPC"))  AddTOFAnalysisTaskCalibPass0();
   if ( detStr.Contains("T0"))   AddTaskT0Calib(runNumber);
   //if ( detStr.Contains("ITSSPD")) tMeanVtx = AddTaskMeanVertexCalib();
   //
   Bool_t okTPC = detStr.Contains("TPC");
   Bool_t useTPCcrv=kFALSE;
-  Bool_t writeITSTP = kTRUE;
+  Bool_t writeITSTP = kFALSE;
   if (!okTPC) useTPCcrv = kFALSE;
   AliAnalysisTaskITSAlignQA *itsAlign = AddTaskSDDCalib(0,writeITSTP,useTPCcrv);
   if (!okTPC) itsAlign->SetUseITSstandaloneTracks(kTRUE);