Remove SDD anode correction maps (presently not used in reconstruction) from Calib...

diff --git a/ITS/AliITSCalibrationSDD.cxx b/ITS/AliITSCalibrationSDD.cxx
index 47f0c342326d4c35b8dd0773a3a099035a6d3195..1cf831f0d8a1519b5b24ec439cae1df2435b0e50 100644 (file)
--- a/ITS/AliITSCalibrationSDD.cxx
+++ b/ITS/AliITSCalibrationSDD.cxx
@@ -146,10 +146,10 @@ void AliITSCalibrationSDD::GetCorrections(Float_t z, Float_t x, Float_t &devz, F
   //correction of coordinates using the maps stored in the DB
   Int_t nSide=seg->GetSideFromLocalX(x);
   devz=0;
-  if(fUseACorrMap){
-    if(nSide==0) devz=fMapAW0->GetCorrection(z,x,seg);
-    else devz=fMapAW1->GetCorrection(z,x,seg);
-  }
+//   if(fUseACorrMap){
+//     if(nSide==0) devz=fMapAW0->GetCorrection(z,x,seg);
+//     else devz=fMapAW1->GetCorrection(z,x,seg);
+//   }
   devx=0;
   if(fUseTCorrMap){
     if(nSide==0) devx=fMapTW0->GetCorrection(z,x,seg);

diff --git a/ITS/AliITSDetTypeRec.cxx b/ITS/AliITSDetTypeRec.cxx
index 9cb576818c5228c3f1430ffa9dbd117df715eea3..2b7fc6e68e1b362bfcb6b2b21d2d537b70e627b7 100644 (file)
--- a/ITS/AliITSDetTypeRec.cxx
+++ b/ITS/AliITSDetTypeRec.cxx
@@ -464,12 +464,12 @@ Bool_t AliITSDetTypeRec::GetCalibration() {
   AliCDBEntry *entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD");
   AliCDBEntry *drSpSDD = AliCDBManager::Instance()->Get("ITS/Calib/DriftSpeedSDD");
   AliCDBEntry *ddlMapSDD = AliCDBManager::Instance()->Get("ITS/Calib/DDLMapSDD");
-  AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD");
+//   AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD");
   AliCDBEntry *mapTSDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsTimeSDD");
 
   if(!entrySPD || !deadSPD || !entrySDD || !entryNoiseSSD || !entryGainSSD || 
      !entryBadChannelsSSD || 
-     !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapASDD || !mapTSDD ){
+     !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapTSDD ){
     AliFatal("Calibration object retrieval failed! ");
     return kFALSE;
   }    
@@ -502,9 +502,9 @@ Bool_t AliITSDetTypeRec::GetCalibration() {
   if(!cacheStatus)ddlMapSDD->SetObject(NULL);
   ddlMapSDD->SetOwner(kTRUE);
 
-  TObjArray *mapAn = (TObjArray *)mapASDD->GetObject();
-  if(!cacheStatus)mapASDD->SetObject(NULL);
-  mapASDD->SetOwner(kTRUE);
+//   TObjArray *mapAn = (TObjArray *)mapASDD->GetObject();
+//   if(!cacheStatus)mapASDD->SetObject(NULL);
+//   mapASDD->SetOwner(kTRUE);
 
   TObjArray *mapT = (TObjArray *)mapTSDD->GetObject();
   if(!cacheStatus)mapTSDD->SetObject(NULL);
@@ -562,14 +562,14 @@ Bool_t AliITSDetTypeRec::GetCalibration() {
     delete entry2SPD;
     delete entry2SDD;
     delete entry2SSD;
-    delete mapASDD;
+    //delete mapASDD;
     delete mapTSDD;
     delete drSpSDD;
     delete ddlMapSDD;
   }
 
   if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!caldeadSPD) ||(!calSDD) || (!drSp) || (!ddlsdd)
-      || (!mapAn) || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badChannelsSSD)) {
+      || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badChannelsSSD)) {
     AliWarning("Can not get calibration from calibration database !");
     return kFALSE;
   }
@@ -599,15 +599,15 @@ Bool_t AliITSDetTypeRec::GetCalibration() {
       Int_t i0=2*i;
       Int_t i1=1+2*i;
       AliITSDriftSpeedArraySDD* arr0 = (AliITSDriftSpeedArraySDD*) drSp->At(i0);
-      AliITSMapSDD* ma0 = (AliITSMapSDD*)mapAn->At(i0);
+      //      AliITSMapSDD* ma0 = (AliITSMapSDD*)mapAn->At(i0);
       AliITSMapSDD* mt0 = (AliITSMapSDD*)mapT->At(i0);
       AliITSDriftSpeedArraySDD* arr1 = (AliITSDriftSpeedArraySDD*) drSp->At(i1);
-      AliITSMapSDD* ma1 = (AliITSMapSDD*)mapAn->At(i1);
+      //      AliITSMapSDD* ma1 = (AliITSMapSDD*)mapAn->At(i1);
       AliITSMapSDD* mt1 = (AliITSMapSDD*)mapT->At(i1);
       cal->SetDriftSpeed(0,arr0);
       cal->SetDriftSpeed(1,arr1);
-      cal->SetMapA(0,ma0);
-      cal->SetMapA(1,ma1);
+//       cal->SetMapA(0,ma0);
+//       cal->SetMapA(1,ma1);
       cal->SetMapT(0,mt0);
       cal->SetMapT(1,mt1);
       SetCalibrationModel(iMod, cal);

diff --git a/ITS/AliITSDetTypeSim.cxx b/ITS/AliITSDetTypeSim.cxx
index 672491a60cac3572488821902562bb5a0d0b09c1..e97b5b13b4e885b21370f0ddd332eea3991db706 100644 (file)
--- a/ITS/AliITSDetTypeSim.cxx
+++ b/ITS/AliITSDetTypeSim.cxx
@@ -439,7 +439,7 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
   AliCDBEntry *entrySDD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSDD", run);
   AliCDBEntry *drSpSDD = AliCDBManager::Instance()->Get("ITS/Calib/DriftSpeedSDD",run);
   AliCDBEntry *ddlMapSDD = AliCDBManager::Instance()->Get("ITS/Calib/DDLMapSDD",run);
-  AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD",run);
+  //AliCDBEntry *mapASDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsAnodeSDD",run);
   AliCDBEntry *mapTSDD = AliCDBManager::Instance()->Get("ITS/Calib/MapsTimeSDD",run);
   // AliCDBEntry *entrySSD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSSD", run);
   AliCDBEntry *entryNoiseSSD = AliCDBManager::Instance()->Get("ITS/Calib/NoiseSSD");
@@ -450,7 +450,7 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
   AliCDBEntry *entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD", run);
 
   if(!entrySPD || !entrySDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD || 
-     !entry2SPD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapASDD ||!mapTSDD){
+     !entry2SPD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapTSDD){
     AliFatal("Calibration object retrieval failed! ");
     return kFALSE;
   }    
@@ -481,9 +481,9 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
   if(!isCacheActive)ddlMapSDD->SetObject(NULL);
   ddlMapSDD->SetOwner(kTRUE);
 
-  TObjArray *mapAn = (TObjArray *)mapASDD->GetObject();
-  if(!isCacheActive)mapASDD->SetObject(NULL);
-  mapASDD->SetOwner(kTRUE);
+//   TObjArray *mapAn = (TObjArray *)mapASDD->GetObject();
+//   if(!isCacheActive)mapASDD->SetObject(NULL);
+//   mapASDD->SetOwner(kTRUE);
 
   TObjArray *mapT = (TObjArray *)mapTSDD->GetObject();
   if(!isCacheActive)mapTSDD->SetObject(NULL);
@@ -558,7 +558,7 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
     delete entryBadChannelsSSD;
     delete entry2SPD;
     delete entry2SSD;
-    delete mapASDD;   
+//    delete mapASDD;   
     delete mapTSDD;
     delete drSpSDD;
     delete ddlMapSDD;
@@ -567,7 +567,7 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
   AliCDBManager::Instance()->SetCacheFlag(origCacheStatus);
 
   if ((!pSPD)||(!pSSD) || (!calSPD) || (!calSDD) || (!drSp) || (!ddlsdd)
-      || (!mapAn) || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badChannelsSSD)) {
+      || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badChannelsSSD)) {
     AliWarning("Can not get calibration from calibration database !");
     return kFALSE;
   }
@@ -605,15 +605,15 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
       Int_t i0=2*i;
       Int_t i1=1+2*i;
       AliITSDriftSpeedArraySDD* arr0 = (AliITSDriftSpeedArraySDD*) drSp->At(i0);
-      AliITSMapSDD* ma0 = (AliITSMapSDD*)mapAn->At(i0);
+//       AliITSMapSDD* ma0 = (AliITSMapSDD*)mapAn->At(i0);
       AliITSMapSDD* mt0 = (AliITSMapSDD*)mapT->At(i0);
       AliITSDriftSpeedArraySDD* arr1 = (AliITSDriftSpeedArraySDD*) drSp->At(i1);
-      AliITSMapSDD* ma1 = (AliITSMapSDD*)mapAn->At(i1);
+ //      AliITSMapSDD* ma1 = (AliITSMapSDD*)mapAn->At(i1);
       AliITSMapSDD* mt1 = (AliITSMapSDD*)mapT->At(i1);
       cal->SetDriftSpeed(0,arr0);
       cal->SetDriftSpeed(1,arr1);
-      cal->SetMapA(0,ma0);
-      cal->SetMapA(1,ma1);
+//       cal->SetMapA(0,ma0);
+//       cal->SetMapA(1,ma1);
       cal->SetMapT(0,mt0);
       cal->SetMapT(1,mt1);
       SetCalibrationModel(iMod, cal);

diff --git a/ITS/Calib/MapsAnodeSDD/Run0_9999999_v0_s0.root b/ITS/Ref/MapsAnodeSDD/Run0_9999999_v0_s0.root
similarity index 100%
rename from ITS/Calib/MapsAnodeSDD/Run0_9999999_v0_s0.root
rename to ITS/Ref/MapsAnodeSDD/Run0_9999999_v0_s0.root