Updating for 2012 reprocessing

diff --git a/PWGPP/CalibMacros/CPass0/makeOCDB.C b/PWGPP/CalibMacros/CPass0/makeOCDB.C
index 9104a0fc3c593ea5853759b8b804049306338678..a84823723cdf644688d43e85f2bba1d1bbc56031 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/makeOCDB.C
+++ b/PWGPP/CalibMacros/CPass0/makeOCDB.C
@@ -178,6 +178,9 @@ void makeOCDB(Int_t runNumber, TString  targetOCDBstorage="", TString sourceOCDB
     Printf("\n******* NOT Calibrating TRD: detStr = %s, TRD_qf = %d *******", detStr.Data(), (Int_t)TRD_qf);
   }
   
+  TF1 *gsf = (TF1 *)gROOT->GetFunction("gaus");
+  if (gsf) for (int i=gsf->GetNpar();i--;) gsf->SetParError(i,0); // reset errors from previous fits
+  
   //Mean Vertex
   AliMeanVertexPreprocessorOffline * procesMeanVtx=0;
   if (detStr.Contains("ITSSPD") && SPD_qf) {

diff --git a/PWGPP/CalibMacros/CPass0/recCPass0.C b/PWGPP/CalibMacros/CPass0/recCPass0.C
index 96eb88ff28b1f35093c67bb6d113f4167d862744..a5c6a542194e2b8e6657d385f749d3c535e33316 100644 (file)
--- a/PWGPP/CalibMacros/CPass0/recCPass0.C
+++ b/PWGPP/CalibMacros/CPass0/recCPass0.C
@@ -66,7 +66,7 @@ void recCPass0(const char *filename="raw.root",Int_t nevents=-1, const char *ocd
   rec.SetWriteESDfriend(kTRUE);
   rec.SetWriteAlignmentData();
   rec.SetUseTrackingErrorsForAlignment("ITS");
-  rec.SetRunReconstruction("ALL -HLT");
+  rec.SetRunReconstruction("ALL");
   rec.SetCleanESD(kFALSE);
 
   //Ignore SetStopOnError

diff --git a/PWGPP/CalibMacros/CPass1/makeOCDB.C b/PWGPP/CalibMacros/CPass1/makeOCDB.C
index 92ba6de32950820e84fc69db145dec7a68646c8d..daaddb32c95d60eb6d5f911160ce550f758633aa 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/makeOCDB.C
+++ b/PWGPP/CalibMacros/CPass1/makeOCDB.C
@@ -65,8 +65,6 @@ void makeOCDB(Int_t runNumber, TString  targetOCDBstorage="", TString sourceOCDB
   if (gSystem->AccessPathName("TPC", kFileExists)==0) {  
     AliCDBManager::Instance()->SetSpecificStorage("TPC/Calib/Correction","local://");
   }
-  AliMagF* fld = TGeoGlobalMagField::Instance()->GetField();
-  Double_t bz = fld->SolenoidField();
 
   // Magnetic field
   AliMagF* fld = TGeoGlobalMagField::Instance()->GetField();

diff --git a/PWGPP/CalibMacros/CPass1/recCPass1.C b/PWGPP/CalibMacros/CPass1/recCPass1.C
index b9b2659a53cb830424b3aacc7265859550b8a977..225354775704cf159cec0e84cdcce2a220d9877e 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/recCPass1.C
+++ b/PWGPP/CalibMacros/CPass1/recCPass1.C
@@ -65,7 +65,7 @@ void recCPass1(const char *filename="raw.root",Int_t nevents=-1, const char *ocd
   rec.SetWriteESDfriend(kTRUE);
   rec.SetWriteAlignmentData();
   rec.SetUseTrackingErrorsForAlignment("ITS");
-  rec.SetRunReconstruction("ALL -HLT");
+  rec.SetRunReconstruction("ALL");
   rec.SetCleanESD(kFALSE);
 
   //Ignore SetStopOnError