Merge branch 'feature-movesplit'

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

diff --git a/PWGPP/CalibMacros/CPass1/recCPass1.C b/PWGPP/CalibMacros/CPass1/recCPass1.C
index daca8f4f8bf6baffb8e51ad247977381f7756df1..225354775704cf159cec0e84cdcce2a220d9877e 100644 (file)
--- a/PWGPP/CalibMacros/CPass1/recCPass1.C
+++ b/PWGPP/CalibMacros/CPass1/recCPass1.C
@@ -11,18 +11,32 @@
 
 void recCPass1(const char *filename="raw.root",Int_t nevents=-1, const char *ocdb="raw://", const char* options="?Trigger=kCalibBarrel")
 {
+  if (gSystem->Getenv("ALIROOT_FORCE_COREDUMP"))
+  {
+    printf("ALIROOT_FORCE_COREDUMP set\n");
+    gSystem->ResetSignal(kSigFloatingException);
+    gSystem->ResetSignal(kSigSegmentationViolation);
+  }
+
   // Load some system libs for Grid and monitoring
   // Set the CDB storage location
   AliCDBManager * man = AliCDBManager::Instance();
   man->SetDefaultStorage(ocdb);
+  
   // Reconstruction settings
   AliReconstruction rec;
   // Upload CDB entries from the snapshot (local root file) if snapshot exist
   if (gSystem->AccessPathName("OCDB.root", kFileExists)==0) {        
-    rec.SetFromCDBSnapshot("OCDB.root");
+    rec.SetCDBSnapshotMode("OCDB.root");
+  }
+
+  if (gSystem->AccessPathName("localOCDBaccessConfig.C", kFileExists)==0) {        
+    gROOT->LoadMacro("localOCDBaccessConfig.C");
+    localOCDBaccessConfig();
   }
+
   // All friends
-  rec.SetFractionFriends(1.0);
+  rec.SetFractionFriends(2.0);
 
  // AliReconstruction settings - hardwired MB trigger for calibration
 
@@ -36,6 +50,7 @@ void recCPass1(const char *filename="raw.root",Int_t nevents=-1, const char *ocd
   // Remove recpoints after each event
   rec.SetDeleteRecPoints("TPC TRD ITS");
 
+
   // Switch off the V0 finder - saves time!
   rec.SetRunMultFinder(kTRUE);
   rec.SetRunV0Finder(kFALSE); 
@@ -51,12 +66,8 @@ void recCPass1(const char *filename="raw.root",Int_t nevents=-1, const char *ocd
   rec.SetWriteAlignmentData();
   rec.SetUseTrackingErrorsForAlignment("ITS");
   rec.SetRunReconstruction("ALL");
-  rec.SetFillESD("ALL");
   rec.SetCleanESD(kFALSE);
 
-  // Specific reco params for ZDC (why isn't this automatic?)
-//  rec.SetRecoParam("ZDC",AliZDCRecoParamPbPb::GetHighFluxParam(2760));
-
   //Ignore SetStopOnError
   rec.SetStopOnError(kFALSE);