minor change to macro

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

diff --git a/ITS/AliITSDetTypeSim.cxx b/ITS/AliITSDetTypeSim.cxx
index daf293bc3cdb0262513b39c669b983065a836af6..bf8fcc5d27ee3e717efb6202d4a8697056234ad0 100644 (file)
--- a/ITS/AliITSDetTypeSim.cxx
+++ b/ITS/AliITSDetTypeSim.cxx
@@ -45,9 +45,9 @@
 #include "AliITSCalibration.h"
 #include "AliITSCalibrationSDD.h"
 #include "AliITSMapSDD.h"
+#include "AliITSCorrMapSDD.h"
 #include "AliITSDriftSpeedArraySDD.h"
 #include "AliITSDriftSpeedSDD.h"
-#include "AliITSHLTforSDD.h"
 #include "AliITSCalibrationSSD.h"
 #include "AliITSNoiseSSDv2.h"
 #include "AliITSGainSSDv2.h"
@@ -63,6 +63,7 @@
 #include "AliITSsimulationSPD.h"
 #include "AliITSsimulationSDD.h"
 #include "AliITSsimulationSSD.h"
+#include "AliITSresponseSDD.h"
 #include "AliITSDDLModuleMapSDD.h"
 #include "AliITSTriggerConditions.h"
 #include "AliBaseLoader.h"
@@ -89,10 +90,11 @@ fRunNumber(0),   //! Run number (to access DB)
 fDigits(),       //! [NMod][NDigits]
 fSimuPar(0),
 fDDLMapSDD(0),
+fRespSDD(0),
+fAveGainSDD(0),
 fkDigClassName(), // String with digit class name.
 fLoader(0),      // local pointer to loader
 fFirstcall(kTRUE),
-fIsHLTmodeC(0), // flag
 fFOGenerator(),
 fTriggerConditions(NULL)
 { 
@@ -143,7 +145,12 @@ AliITSDetTypeSim::~AliITSDetTypeSim(){
        delete fCalibration;
     }
     fCalibration = 0;
-    if(fSSDCalibration) delete fSSDCalibration;
+    if(fSSDCalibration) {
+      if(!(AliCDBManager::Instance()->GetCacheFlag())) {
+       delete fSSDCalibration;
+       fSSDCalibration = NULL;
+      }
+    }
     if(fSPDNoisy){
     if(!(AliCDBManager::Instance()->GetCacheFlag())) {
        fSPDNoisy->Delete();
@@ -152,6 +159,12 @@ AliITSDetTypeSim::~AliITSDetTypeSim(){
       }
     }
     if(fSimuPar) delete fSimuPar;
+    if(fRespSDD){
+      if(!(AliCDBManager::Instance()->GetCacheFlag())){
+       delete fRespSDD;
+       fRespSDD=0;
+      }
+    }
     if(fDDLMapSDD) delete fDDLMapSDD;
     if(fNDigits) delete [] fNDigits;
     fNDigits = 0;
@@ -178,10 +191,11 @@ fRunNumber(source.fRunNumber),   //! Run number (to access DB)
 fDigits(source.fDigits),       //! [NMod][NDigits]
 fSimuPar(source.fSimuPar),
 fDDLMapSDD(source.fDDLMapSDD),
+fRespSDD(source.fRespSDD),
+fAveGainSDD(source.fAveGainSDD),
 fkDigClassName(), // String with digit class name.
 fLoader(source.fLoader),      // local pointer to loader
 fFirstcall(source.fFirstcall),
-fIsHLTmodeC(source.fIsHLTmodeC),
 fFOGenerator(source.fFOGenerator),
 fTriggerConditions(source.fTriggerConditions) 
 {
@@ -461,9 +475,9 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
   AliCDBEntry *foEffSPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDFOEfficiency", run);
   AliCDBEntry *foNoiSPD = AliCDBManager::Instance()->Get("ITS/Calib/SPDFONoise", run);
   AliCDBEntry *entrySDD = AliCDBManager::Instance()->Get("ITS/Calib/CalibSDD", run);
+  AliCDBEntry *entry2SDD = AliCDBManager::Instance()->Get("ITS/Calib/RespSDD");
   AliCDBEntry *drSpSDD = AliCDBManager::Instance()->Get("ITS/Calib/DriftSpeedSDD",run);
   AliCDBEntry *ddlMapSDD = AliCDBManager::Instance()->Get("ITS/Calib/DDLMapSDD",run);
-  AliCDBEntry *hltforSDD = AliCDBManager::Instance()->Get("ITS/Calib/HLTforSDD");
   //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);
@@ -472,8 +486,8 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
   AliCDBEntry *entryBadChannelsSSD = AliCDBManager::Instance()->Get("ITS/Calib/BadChannelsSSD");
 
 if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD 
-     || !entrySDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD 
-     || !drSpSDD || !ddlMapSDD || !hltforSDD || !mapTSDD){
+     || !entrySDD  || !entry2SDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD 
+     || !drSpSDD || !ddlMapSDD || !mapTSDD){
     AliFatal("Calibration object retrieval failed! ");
     return kFALSE;
   }            
@@ -499,6 +513,10 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD
   if(!isCacheActive)entrySDD->SetObject(NULL);
   entrySDD->SetOwner(kTRUE);
 
+  AliITSresponseSDD *pSDD = (AliITSresponseSDD*)entry2SDD->GetObject();
+  if(!isCacheActive)entry2SDD->SetObject(NULL);
+  entry2SDD->SetOwner(kTRUE);
+
   TObjArray *drSp = (TObjArray *)drSpSDD->GetObject();
   if(!isCacheActive)drSpSDD->SetObject(NULL);
   drSpSDD->SetOwner(kTRUE);
@@ -507,10 +525,6 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD
   if(!isCacheActive)ddlMapSDD->SetObject(NULL);
   ddlMapSDD->SetOwner(kTRUE);
 
-  AliITSHLTforSDD* hltsdd=(AliITSHLTforSDD*)hltforSDD->GetObject();
-  if(!isCacheActive)hltforSDD->SetObject(NULL);
-  hltforSDD->SetOwner(kTRUE);
-
 //   TObjArray *mapAn = (TObjArray *)mapASDD->GetObject();
 //   if(!isCacheActive)mapASDD->SetObject(NULL);
 //   mapASDD->SetOwner(kTRUE);
@@ -525,11 +539,12 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD
   entrySSD->SetOwner(kTRUE);
   */
 
-  TObject *emptyssd = 0; TString ssdobjectname = 0;
-  AliITSNoiseSSDv2 *noiseSSD = new AliITSNoiseSSDv2();  
+  TObject *emptyssd = 0; TString ssdobjectname;
+  AliITSNoiseSSDv2 *noiseSSD = NULL; 
   emptyssd = (TObject *)entryNoiseSSD->GetObject();
   ssdobjectname = emptyssd->GetName();
   if(ssdobjectname=="TObjArray") {
+    noiseSSD = new AliITSNoiseSSDv2(); 
     TObjArray *noiseSSDOld = (TObjArray *)entryNoiseSSD->GetObject();
     ReadOldSSDNoise(noiseSSDOld, noiseSSD);
   }
@@ -538,11 +553,12 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD
   if(!isCacheActive)entryNoiseSSD->SetObject(NULL);
   entryNoiseSSD->SetOwner(kTRUE);
 
-  AliITSGainSSDv2 *gainSSD = new AliITSGainSSDv2();
+  AliITSGainSSDv2 *gainSSD = NULL;
   emptyssd = (TObject *)entryGainSSD->GetObject();
   ssdobjectname = emptyssd->GetName();
   if(ssdobjectname=="Gain") {
     TObjArray *gainSSDOld = (TObjArray *)entryGainSSD->GetObject();
+    gainSSD = new AliITSGainSSDv2();
     ReadOldSSDGain(gainSSDOld, gainSSD);
   }
   else if(ssdobjectname=="AliITSGainSSDv2")
@@ -550,11 +566,12 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD
   if(!isCacheActive)entryGainSSD->SetObject(NULL);
   entryGainSSD->SetOwner(kTRUE);
 
-  AliITSBadChannelsSSDv2 *badChannelsSSD = new AliITSBadChannelsSSDv2();
+  AliITSBadChannelsSSDv2 *badChannelsSSD = NULL;
   emptyssd = (TObject *)entryBadChannelsSSD->GetObject();
   ssdobjectname = emptyssd->GetName();
   if(ssdobjectname=="TObjArray") {
     TObjArray *badChannelsSSDOld = (TObjArray *)entryBadChannelsSSD->GetObject();
+    badChannelsSSD = new AliITSBadChannelsSSDv2();
     ReadOldSSDBadChannels(badChannelsSSDOld, badChannelsSSD);
   }
   else if(ssdobjectname=="AliITSBadChannelsSSDv2")
@@ -582,11 +599,11 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD
     delete foEffSPD;
     delete foNoiSPD;
     delete entrySDD;
+    delete entry2SDD;
     delete entryNoiseSSD;
     delete entryGainSSD;
     delete entryBadChannelsSSD;
 //    delete mapASDD;   
-    delete hltforSDD;
     delete mapTSDD;
     delete drSpSDD;
     delete ddlMapSDD;
@@ -595,7 +612,7 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD
   AliCDBManager::Instance()->SetCacheFlag(origCacheStatus);
 
  if ((!calDeadSPD) || (!calNoisySPD) || (!calFoEffSPD) || (!calFoNoiSPD) 
-      || (!calSDD) || (!drSp) || (!ddlsdd) || (!hltsdd) 
+      || (!calSDD) || (!pSDD)|| (!drSp) || (!ddlsdd)  
       || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badChannelsSSD)) {
     AliWarning("Can not get calibration from calibration database !");
     return kFALSE;
@@ -605,7 +622,7 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD
   fNMod[0] = calDeadSPD->GetEntries();
   fNMod[1] = calSDD->GetEntries();
   //  fNMod[2] = noiseSSD->GetEntries();
-  AliInfo(Form("%i SPD, %i SDD and %i SSD in calibration database",
+  AliDebug(1,Form("%i SPD, %i SDD and %i SSD in calibration database",
               fNMod[0], fNMod[1], fNMod[2]));
   AliITSCalibration* cal;
   for (Int_t i=0; i<fNMod[0]; i++) {
@@ -619,7 +636,16 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD
   fFOGenerator.SetNoise(calFoNoiSPD); // this cal object is used only by the generator
   
   fDDLMapSDD->SetDDLMap(ddlsdd);
-  fIsHLTmodeC=hltsdd->IsHLTmodeC();
+  fRespSDD=pSDD;
+  Float_t avegain=0.;
+  Float_t nGdAnodes=0;
+  Bool_t oldMapFormat=kFALSE;
+  TObject* objmap=(TObject*)mapT->At(0);
+  TString cname(objmap->ClassName());
+  if(cname.CompareTo("AliITSMapSDD")==0){ 
+    oldMapFormat=kTRUE;
+    AliInfo("SDD Maps converted to new format");
+  }
 
   for (Int_t i=0; i<fgkDefaultNModulesSDD; i++) {
     Int_t iddl,icarlos;
@@ -637,24 +663,36 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD
       AliWarning(Form("SDD module %d not present in DDL map: set it as dead",iMod));
     }else{
       cal = (AliITSCalibration*) calSDD->At(i);
+      for(Int_t iAnode=0;iAnode< ((AliITSCalibrationSDD*)cal)->NOfAnodes(); iAnode++){
+       if(((AliITSCalibrationSDD*)cal)->IsBadChannel(iAnode)) continue;
+       avegain+= ((AliITSCalibrationSDD*)cal)->GetChannelGain(iAnode);
+       nGdAnodes++;
+      }
       Int_t i0=2*i;
       Int_t i1=1+2*i;
       AliITSDriftSpeedArraySDD* arr0 = (AliITSDriftSpeedArraySDD*) drSp->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* mt1 = (AliITSMapSDD*)mapT->At(i1);
+
+      AliITSCorrMapSDD* mt0 = 0;
+      AliITSCorrMapSDD* mt1 = 0;
+      if(oldMapFormat){ 
+       AliITSMapSDD* oldmap0=(AliITSMapSDD*)mapT->At(i0);
+       AliITSMapSDD* oldmap1=(AliITSMapSDD*)mapT->At(i1);
+       mt0=oldmap0->ConvertToNewFormat();
+       mt1=oldmap1->ConvertToNewFormat();
+      }else{
+       mt0=(AliITSCorrMapSDD*)mapT->At(i0);
+       mt1=(AliITSCorrMapSDD*)mapT->At(i1);
+      }
       cal->SetDriftSpeed(0,arr0);
       cal->SetDriftSpeed(1,arr1);
-//       cal->SetMapA(0,ma0);
-//       cal->SetMapA(1,ma1);
       cal->SetMapT(0,mt0);
       cal->SetMapT(1,mt1);
       SetCalibrationModel(iMod, cal);
     }
   }
-
+  if(nGdAnodes) fAveGainSDD=avegain/nGdAnodes;
+  AliDebug(3,Form("SDD average gain=%f\n",fAveGainSDD));
   fSSDCalibration->SetNoise(noiseSSD);
   fSSDCalibration->SetGain(gainSSD);
   fSSDCalibration->SetBadChannels(badChannelsSSD);
@@ -972,7 +1010,7 @@ AliITSTriggerConditions* AliITSDetTypeSim::GetTriggerConditions() {
     if (fRunNumber<0) isCacheActive=kFALSE;
     else              isCacheActive=kTRUE;
     AliCDBManager::Instance()->SetCacheFlag(isCacheActive);
-    AliCDBEntry *pitCond = AliCDBManager::Instance()->Get("ITS/Calib/PITConditions", fRunNumber);
+    AliCDBEntry *pitCond = AliCDBManager::Instance()->Get("TRIGGER/SPD/PITConditions", fRunNumber);
     if (!pitCond) {
       AliError("Trigger conditions retrieval failed! ");
       return NULL;
@@ -999,18 +1037,12 @@ void AliITSDetTypeSim::WriteFOSignals() {
     return;
   }
 
-  AliBaseLoader* foLoader = fLoader->GetFOSignalsLoader();
-  if (!foLoader) {
-    AliError("Base loader (FO) not retrieved.");
-    return;
+  if(!fLoader->TreeD()){
+   AliError("No TreeD available");
+   return;
   }
-  
-  // make a new fo signals object - to have the loader own and delete as it wants later
-  AliITSFOSignalsSPD *foSignals = new AliITSFOSignalsSPD(*GetFOSignals());
-
-  foLoader->Post(foSignals);
-
-  foLoader->WriteData();
-
+  TTree *tree = fLoader->TreeD();
+  AliITSFOSignalsSPD *foSignals = new AliITSFOSignalsSPD(*GetFOSignals()); 
+  tree->GetUserInfo()->Add(foSignals);
 }