Update to FindFASTJET.cmake; now accepts also for -DFASTJET= option

[u/mrichter/AliRoot.git] / ITS / AliITSAlignMille2.cxx

diff --git a/ITS/AliITSAlignMille2.cxx b/ITS/AliITSAlignMille2.cxx
index 2fe25dd95944b76572981525188346226c61c0b1..80c6a439e33a4966b34901e90f6fa78ec57449fd 100644 (file)
--- a/ITS/AliITSAlignMille2.cxx
+++ b/ITS/AliITSAlignMille2.cxx
@@ -4147,6 +4147,50 @@ Int_t AliITSAlignMille2::LoadSDDCorrMap(TString& path, AliITSCorrectSDDPoints *&
   return 0;
 }
 
+//________________________________________________________________________________________________________
+Int_t AliITSAlignMille2::LoadPreSDDCalib()
+{
+  // Load SDD correction map for prealignment from current CDB
+  //
+  AliInfo(Form("Loading SDD Calibration set for run %d",fRunID));
+  AliCDBManager* man = AliCDBManager::Instance();
+  man->SetRun(fRunID);
+  AliCDBEntry *entry = man->Get("ITS/Calib/MapsTimeSDD");
+  if(!entry){
+    AliError("Error accessing OCDB: SDD maps not found");
+    return -1;
+  }
+  delete fPreCorrMapSDD;
+  TObjArray* arr = (TObjArray*) entry->GetObject();
+  entry->SetObject(NULL);
+  entry->SetOwner(kTRUE);
+  arr->SetOwner(kTRUE);
+  fPreCorrMapSDD = new AliITSCorrectSDDPoints(arr);
+  //
+  entry = man->Get("ITS/Calib/RespSDD");
+  if(!entry){
+    AliError("Error accessing OCDB: SDD response not found");
+    return -1;
+  }
+  delete fPreRespSDD;
+  fPreRespSDD = (AliITSresponseSDD*) entry->GetObject();
+  entry->SetObject(NULL);
+  entry->SetOwner(kTRUE);
+  //
+  entry = man->Get("ITS/Calib/DriftSpeedSDD");
+  if(!entry){
+    AliError("Error accessing OCDB: SDD Drift speed not found");
+    return -1;
+  }
+  delete fPreVDriftSDD;
+  fPreVDriftSDD = (TObjArray*) entry->GetObject();
+  entry->SetObject(NULL);
+  entry->SetOwner(kTRUE);
+  delete entry;
+  //
+  return 0;
+}
+
 //________________________________________________________________________________________________________
 Int_t AliITSAlignMille2::LoadDiamond(TString& path)
 {
@@ -4273,7 +4317,7 @@ Int_t AliITSAlignMille2::CacheMatricesOrig()
   // build arrays for the fast access to sensor original matrices (used for production)
   //
   TGeoHMatrix mdel;
-  AliInfo("Building sensors original matrices cache");
+  AliInfo(Form("Building sensors original matrices cache. InitDeltaPath: %s",fIniDeltaPath.Data()));
   //
   /*if (fIniGeomPath!=fGeometryPath)*/ if (LoadGeometry(fIniGeomPath)) {AliInfo("Failed to re-load ideal geometry");exit(1);}
   //
@@ -4563,6 +4607,7 @@ Int_t AliITSAlignMille2::ReloadInitCalib()
   // Load the initial calib parameters (geometry, SDD response...)
   // Can be used if set of data was processed with different calibration
   //
+  AliInfo(Form("SameInitDelta: %d | SameInitGeom: %d",TestBit(kSameInitDeltasBit), TestBit(kSameInitGeomBit)));
   // 1st cache original matrices
   if (!(TestBit(kSameInitDeltasBit) && TestBit(kSameInitGeomBit))) { // need to reload geometry
     //