]> git.uio.no Git - u/mrichter/AliRoot.git/blobdiff - ITS/AliITSDetTypeSim.cxx
HLT mode retrieved from the OCDB and used to set SDD raw data format in simulation...
[u/mrichter/AliRoot.git] / ITS / AliITSDetTypeSim.cxx
index a01e44e2f3e373ba163629054104d7c933f19508..6ee14d2b3ebbd55ab0e6987efa9be796ea170ff9 100644 (file)
 #include "AliITSdigitSSD.h"
 #include "AliITSDetTypeSim.h"
 #include "AliITSpListItem.h"
-#include "AliITSresponseSDD.h"
 #include "AliITSCalibrationSDD.h"
 #include "AliITSMapSDD.h"
 #include "AliITSDriftSpeedArraySDD.h"
 #include "AliITSDriftSpeedSDD.h"
+#include "AliITSHLTforSDD.h"
 #include "AliITSCalibrationSSD.h"
+#include "AliITSNoiseSSDv2.h"
+#include "AliITSGainSSDv2.h"
+#include "AliITSBadChannelsSSDv2.h"
 #include "AliITSNoiseSSD.h"
 #include "AliITSGainSSD.h"
 #include "AliITSBadChannelsSSD.h"
@@ -74,6 +77,7 @@ TObject(),
 fSimulation(),   // [NDet]
 fSegmentation(), // [NDet]
 fCalibration(),     // [NMod]
+fSSDCalibration(0),
 fPreProcess(),   // [] e.g. Fill fHitModule with hits
 fPostProcess(),  // [] e.g. Wright Raw data
 fNSDigits(0),    //! number of SDigits
@@ -81,12 +85,14 @@ fSDigits("AliITSpListItem",1000),
 fNDigits(0),     //! number of Digits
 fRunNumber(0),   //! Run number (to access DB)
 fDigits(),       //! [NMod][NDigits]
+fSimuPar(0),
 fDDLMapSDD(0),
 fHitClassName(), // String with Hit class name.
 fSDigClassName(),// String with SDigit class name.
 fDigClassName(), // String with digit class name.
 fLoader(0),      // local pointer to loader
-fFirstcall(kTRUE){ // flag
+fFirstcall(kTRUE),
+fIsHLTmodeC(0){ // flag
     // Default Constructor
     // Inputs:
     //    none.
@@ -101,6 +107,8 @@ fFirstcall(kTRUE){ // flag
   fDigits = new TObjArray(fgkNdettypes);
   fNDigits = new Int_t[fgkNdettypes];
   fDDLMapSDD=new AliITSDDLModuleMapSDD();
+  fSimuPar= new AliITSSimuParam();
+  fSSDCalibration=new AliITSCalibrationSSD();
   fNMod[0] = fgkDefaultNModulesSPD;
   fNMod[1] = fgkDefaultNModulesSDD;
   fNMod[2] = fgkDefaultNModulesSSD;
@@ -127,20 +135,13 @@ AliITSDetTypeSim::~AliITSDetTypeSim(){
     }
     fSegmentation = 0;
     if(fCalibration && fRunNumber<0){
-       AliITSresponse* rspd = ((AliITSCalibration*)fCalibration->At(
-                               GetITSgeom()->GetStartSPD()))->GetResponse();
-       AliITSresponse* rsdd = ((AliITSCalibration*)fCalibration->At(
-                               GetITSgeom()->GetStartSDD()))->GetResponse();
-       AliITSresponse* rssd = ((AliITSCalibration*)fCalibration->At(
-                               GetITSgeom()->GetStartSSD()))->GetResponse();
-       if(rspd) delete rspd;
-       if(rsdd) delete rsdd;
-       if(rssd) delete rssd;
+
        fCalibration->Delete();
        delete fCalibration;
     }
     fCalibration = 0;
-    if(fPreProcess){
+    if(fSSDCalibration) delete fSSDCalibration;
+     if(fPreProcess){
        fPreProcess->Delete();
        delete fPreProcess;
     }
@@ -150,6 +151,7 @@ AliITSDetTypeSim::~AliITSDetTypeSim(){
        delete fPostProcess;
     }
     fPostProcess = 0;
+    if(fSimuPar) delete fSimuPar;
     if(fDDLMapSDD) delete fDDLMapSDD;
     if(fNDigits) delete [] fNDigits;
     fNDigits = 0;
@@ -167,6 +169,7 @@ AliITSDetTypeSim::AliITSDetTypeSim(const AliITSDetTypeSim &source) : TObject(sou
 fSimulation(source.fSimulation),   // [NDet]
 fSegmentation(source.fSegmentation), // [NDet]
 fCalibration(source.fCalibration),     // [NMod]
+fSSDCalibration(source.fSSDCalibration),
 fPreProcess(source.fPreProcess),   // [] e.g. Fill fHitModule with hits
 fPostProcess(source.fPostProcess),  // [] e.g. Wright Raw data
 fNSDigits(source.fNSDigits),    //! number of SDigits
@@ -174,12 +177,14 @@ fSDigits(*((TClonesArray*)source.fSDigits.Clone())),
 fNDigits(source.fNDigits),     //! number of Digits
 fRunNumber(source.fRunNumber),   //! Run number (to access DB)
 fDigits(source.fDigits),       //! [NMod][NDigits]
+fSimuPar(source.fSimuPar),
 fDDLMapSDD(source.fDDLMapSDD),
 fHitClassName(source.fHitClassName), // String with Hit class name.
 fSDigClassName(source.fSDigClassName),// String with SDigit class name.
 fDigClassName(), // String with digit class name.
 fLoader(source.fLoader),      // local pointer to loader
-fFirstcall(source.fFirstcall)
+fFirstcall(source.fFirstcall),
+fIsHLTmodeC(source.fIsHLTmodeC)
 {
     // Copy Constructor for object AliITSDetTypeSim not allowed
   for(Int_t i=0;i<fgkNdettypes;i++){
@@ -276,7 +281,12 @@ void AliITSDetTypeSim::SetDefaultSegmentation(Int_t idet){
     if(idet==0){
        seg = new AliITSsegmentationSPD();
     }else if(idet==1){
-       seg = new AliITSsegmentationSDD();
+      seg = new AliITSsegmentationSDD();
+      AliITSCalibrationSDD* cal=(AliITSCalibrationSDD*)GetCalibrationModel(fgkDefaultNModulesSPD+1);
+      if(cal->IsAMAt20MHz()){ 
+       seg->SetPadSize(seg->Dpz(0),20.);
+       seg->SetNPads(seg->Npz()/2,128);
+      }
     }else {
        seg = new AliITSsegmentationSSD();
     }
@@ -340,15 +350,14 @@ void AliITSDetTypeSim::SetCalibrationModel(Int_t iMod, AliITSCalibration *resp){
 void AliITSDetTypeSim::ResetCalibrationArray(){
     //resets response array
     if(fCalibration && fRunNumber<0){  // if fRunNumber<0 fCalibration is owner
+      /*
        AliITSresponse* rspd = ((AliITSCalibration*)fCalibration->At(
                                 GetITSgeom()->GetStartSPD()))->GetResponse();
-       AliITSresponse* rsdd = ((AliITSCalibration*)fCalibration->At(
-                                GetITSgeom()->GetStartSDD()))->GetResponse();
        AliITSresponse* rssd = ((AliITSCalibration*)fCalibration->At(
                                 GetITSgeom()->GetStartSSD()))->GetResponse();
        if(rspd) delete rspd;
-       if(rsdd) delete rsdd;
        if(rssd) delete rssd;
+      */
        fCalibration->Clear();
     }else if (fCalibration && fRunNumber>=0){
        fCalibration->Clear();
@@ -367,7 +376,14 @@ AliITSCalibration* AliITSDetTypeSim::GetCalibrationModel(Int_t iMod){
        AliError("fCalibration is 0!");
        return 0; 
     }
-  return (AliITSCalibration*)(fCalibration->At(iMod));
+  if(iMod<fgkDefaultNModulesSPD+fgkDefaultNModulesSDD){
+    return (AliITSCalibration*)fCalibration->At(iMod);
+  }else{
+    Int_t i=iMod-(fgkDefaultNModulesSPD+fgkDefaultNModulesSDD);
+    fSSDCalibration->SetModule(i);
+    return (AliITSCalibration*)fSSDCalibration;
+  }
+
 }
 //_______________________________________________________________________
 void AliITSDetTypeSim::SetDefaults(){
@@ -384,43 +400,13 @@ void AliITSDetTypeSim::SetDefaults(){
     ResetSegmentation();
     if(!GetCalibration()){AliFatal("Exit"); exit(0);}
 
+    SetDigitClassName(0,"AliITSdigitSPD");
+    SetDigitClassName(1,"AliITSdigitSDD");
+    SetDigitClassName(2,"AliITSdigitSSD");
+
     for(Int_t idet=0;idet<fgkNdettypes;idet++){
-       //SPD
-       if(idet==0){
-           if(!GetSegmentationModel(idet)) SetDefaultSegmentation(idet);
-           const char *kData0=(GetCalibrationModel(GetITSgeom()->GetStartSPD()))->DataType();
-           if (strstr(kData0,"real")) {
-               SetDigitClassName(idet,"AliITSdigit");
-           }else {
-               SetDigitClassName(idet,"AliITSdigitSPD");
-           } // end if
-       } // end if idet==0
-       //SDD
-       if(idet==1){
-           if(!GetSegmentationModel(idet)) SetDefaultSegmentation(idet);
-           AliITSCalibrationSDD* rsp = 
-               (AliITSCalibrationSDD*)GetCalibrationModel(
-                   GetITSgeom()->GetStartSDD());
-           const char *kopt = ((AliITSresponseSDD*)rsp->GetResponse())->
-               ZeroSuppOption();
-           if(!strstr(kopt,"ZS")) {
-             SetDigitClassName(idet,"AliITSdigit");
-           }else {
-             SetDigitClassName(idet,"AliITSdigitSDD");
-           } // end if
-       } // end if idet==1
-       //SSD
-       if(idet==2){
-           if(!GetSegmentationModel(idet))SetDefaultSegmentation(idet);
-           const char *kData2 = (GetCalibrationModel(
-                                  GetITSgeom()->GetStartSSD())->DataType());
-           if (strstr(kData2,"real")) {
-               SetDigitClassName(idet,"AliITSdigit");
-           }else {
-               SetDigitClassName(idet,"AliITSdigitSSD");
-           } // end if
-       } // end if idet==2
-    }// end for idet
+      if(!GetSegmentationModel(idet)) SetDefaultSegmentation(idet);
+    }
 }
 //______________________________________________________________________
 Bool_t AliITSDetTypeSim::GetCalibration() {
@@ -453,45 +439,30 @@ 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 *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);
   AliCDBEntry *entryNoiseSSD = AliCDBManager::Instance()->Get("ITS/Calib/NoiseSSD");
   AliCDBEntry *entryGainSSD = AliCDBManager::Instance()->Get("ITS/Calib/GainSSD");
   AliCDBEntry *entryBadChannelsSSD = AliCDBManager::Instance()->Get("ITS/Calib/BadChannelsSSD");
 
-  AliCDBEntry *entry2SPD = AliCDBManager::Instance()->Get("ITS/Calib/RespSPD", run);
-  AliCDBEntry *entry2SDD = AliCDBManager::Instance()->Get("ITS/Calib/RespSDD", run);
-  AliCDBEntry *entry2SSD = AliCDBManager::Instance()->Get("ITS/Calib/RespSSD", run);
-
   if(!entrySPD || !entrySDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD || 
-     !entry2SPD || !entry2SDD || !entry2SSD || !drSpSDD || !ddlMapSDD || !mapASDD ||!mapTSDD){
+      !drSpSDD || !ddlMapSDD || !hltforSDD || !mapTSDD){
     AliFatal("Calibration object retrieval failed! ");
     return kFALSE;
   }    
-
-//   if(!entrySPD || !entrySDD || !entryNoiseSSD || !entryGainSSD || !entryBadChannelsSSD || 
-//      !entry2SPD || !entry2SDD || !entry2SSD){
-//     AliFatal("Calibration object retrieval failed! ");
-//     return kFALSE;
-//   }         
+       
 
   TObjArray *calSPD = (TObjArray *)entrySPD->GetObject();
   if(!isCacheActive)entrySPD->SetObject(NULL);
   entrySPD->SetOwner(kTRUE);
 
-  AliITSresponseSPD *pSPD = (AliITSresponseSPD*)entry2SPD->GetObject();
-  if(!isCacheActive)entry2SPD->SetObject(NULL);
-  entry2SPD->SetOwner(kTRUE);
    
   TObjArray *calSDD = (TObjArray *)entrySDD->GetObject();
   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);
@@ -500,9 +471,13 @@ 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);
+  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);
 
   TObjArray *mapT = (TObjArray *)mapTSDD->GetObject();
   if(!isCacheActive)mapTSDD->SetObject(NULL);
@@ -514,22 +489,56 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
   entrySSD->SetOwner(kTRUE);
   */
 
-  TObjArray *noiseSSD = (TObjArray *)entryNoiseSSD->GetObject();
+  TObject *emptyssd = 0; TString ssdobjectname = 0;
+  AliITSNoiseSSDv2 *noiseSSD = new AliITSNoiseSSDv2();  
+  emptyssd = (TObject *)entryNoiseSSD->GetObject();
+  ssdobjectname = emptyssd->GetName();
+  if(ssdobjectname=="TObjArray") {
+    TObjArray *noiseSSDOld = (TObjArray *)entryNoiseSSD->GetObject();
+    ReadOldSSDNoise(noiseSSDOld, noiseSSD);
+  }
+  else if(ssdobjectname=="AliITSNoiseSSDv2")
+    noiseSSD = (AliITSNoiseSSDv2 *)entryNoiseSSD->GetObject();
   if(!isCacheActive)entryNoiseSSD->SetObject(NULL);
   entryNoiseSSD->SetOwner(kTRUE);
 
-  TObjArray *gainSSD = (TObjArray *)entryGainSSD->GetObject();
+  AliITSGainSSDv2 *gainSSD = new AliITSGainSSDv2();
+  emptyssd = (TObject *)entryGainSSD->GetObject();
+  ssdobjectname = emptyssd->GetName();
+  if(ssdobjectname=="Gain") {
+    TObjArray *gainSSDOld = (TObjArray *)entryGainSSD->GetObject();
+    ReadOldSSDGain(gainSSDOld, gainSSD);
+  }
+  else if(ssdobjectname=="AliITSGainSSDv2")
+    gainSSD = (AliITSGainSSDv2 *)entryGainSSD->GetObject();
   if(!isCacheActive)entryGainSSD->SetObject(NULL);
   entryGainSSD->SetOwner(kTRUE);
 
-  TObjArray *badchannelsSSD = (TObjArray *)entryBadChannelsSSD->GetObject();
+  AliITSBadChannelsSSDv2 *badChannelsSSD = new AliITSBadChannelsSSDv2();
+  emptyssd = (TObject *)entryBadChannelsSSD->GetObject();
+  ssdobjectname = emptyssd->GetName();
+  if(ssdobjectname=="TObjArray") {
+    TObjArray *badChannelsSSDOld = (TObjArray *)entryBadChannelsSSD->GetObject();
+    ReadOldSSDBadChannels(badChannelsSSDOld, badChannelsSSD);
+  }
+  else if(ssdobjectname=="AliITSBadChannelsSSDv2")
+    badChannelsSSD = (AliITSBadChannelsSSDv2*)entryBadChannelsSSD->GetObject();
   if(!isCacheActive)entryBadChannelsSSD->SetObject(NULL);
   entryBadChannelsSSD->SetOwner(kTRUE);
 
-  AliITSresponseSSD *pSSD = (AliITSresponseSSD*)entry2SSD->GetObject();
-  if(!isCacheActive)entry2SSD->SetObject(NULL);
-  entry2SSD->SetOwner(kTRUE);
-  
+  /*AliITSNoiseSSDv2 *noiseSSD = (AliITSNoiseSSDv2 *)entryNoiseSSD->GetObject();
+  if(!isCacheActive)entryNoiseSSD->SetObject(NULL);
+  entryNoiseSSD->SetOwner(kTRUE);
+
+  AliITSGainSSDv2 *gainSSD = (AliITSGainSSDv2 *)entryGainSSD->GetObject();
+  if(!isCacheActive)entryGainSSD->SetObject(NULL);
+  entryGainSSD->SetOwner(kTRUE);
+
+  AliITSBadChannelsSSDv2 *badchannelsSSD = 
+    (AliITSBadChannelsSSDv2 *)entryBadChannelsSSD->GetObject();
+  if(!isCacheActive)entryBadChannelsSSD->SetObject(NULL);
+  entryBadChannelsSSD->SetOwner(kTRUE);*/
+
   // DB entries are deleted. In this way metadeta objects are deleted as well
   if(!isCacheActive){
     delete entrySPD;
@@ -537,10 +546,8 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
     delete entryNoiseSSD;
     delete entryGainSSD;
     delete entryBadChannelsSSD;
-    delete entry2SPD;
-    delete entry2SDD;
-    delete entry2SSD;
-    delete mapASDD;   
+//    delete mapASDD;   
+    delete hltforSDD;
     delete mapTSDD;
     delete drSpSDD;
     delete ddlMapSDD;
@@ -548,25 +555,25 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
   
   AliCDBManager::Instance()->SetCacheFlag(origCacheStatus);
 
-  if ((!pSPD)||(!pSDD)||(!pSSD) || (!calSPD) || (!calSDD) || (!drSp) || (!ddlsdd)
-      || (!mapAn) || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badchannelsSSD)) {
+  if ((!calSPD) || (!calSDD) || (!drSp) || (!ddlsdd)
+      || (!hltsdd) || (!mapT) || (!noiseSSD)|| (!gainSSD)|| (!badChannelsSSD)) {
     AliWarning("Can not get calibration from calibration database !");
     return kFALSE;
   }
 
   fNMod[0] = calSPD->GetEntries();
   fNMod[1] = calSDD->GetEntries();
-  fNMod[2] = noiseSSD->GetEntries();
+  //  fNMod[2] = noiseSSD->GetEntries();
   AliInfo(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++) {
     cal = (AliITSCalibration*) calSPD->At(i);
-    cal->SetResponse(pSPD);
     SetCalibrationModel(i, cal);
   }
 
   fDDLMapSDD->SetDDLMap(ddlsdd);
+  fIsHLTmodeC=hltsdd->IsHLTmodeC();
 
   for (Int_t i=0; i<fgkDefaultNModulesSDD; i++) {
     Int_t iddl,icarlos;
@@ -574,7 +581,6 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
     fDDLMapSDD->FindInDDLMap(iMod,iddl,icarlos);
     if(iddl<0){ 
       AliITSCalibrationSDD* calsdddead=new AliITSCalibrationSDD();
-      calsdddead->SetResponse(pSDD);
       calsdddead->SetBad();      
       AliITSDriftSpeedSDD* driftspdef = new AliITSDriftSpeedSDD();
       AliITSDriftSpeedArraySDD* arrdrsp=new AliITSDriftSpeedArraySDD(1);
@@ -585,40 +591,31 @@ Bool_t AliITSDetTypeSim::GetCalibration() {
       AliWarning(Form("SDD module %d not present in DDL map: set it as dead",iMod));
     }else{
       cal = (AliITSCalibration*) calSDD->At(i);
-      cal->SetResponse(pSDD);
       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);
     }
   }
 
-  for (Int_t i=0; i<fNMod[2]; i++) {
-    AliITSCalibrationSSD *calibSSD = new AliITSCalibrationSSD();
-    calibSSD->SetResponse((AliITSresponse*)pSSD);
-    
-    AliITSNoiseSSD *noise = (AliITSNoiseSSD*) (noiseSSD->At(i));
-    calibSSD->SetNoise(noise);
-    AliITSGainSSD *gain = (AliITSGainSSD*) (gainSSD->At(i));
-    calibSSD->SetGain(gain);
-    AliITSBadChannelsSSD *bad = (AliITSBadChannelsSSD*) (badchannelsSSD->At(i));
-    calibSSD->SetBadChannels(bad);
+  fSSDCalibration->SetNoise(noiseSSD);
+  fSSDCalibration->SetGain(gainSSD);
+  fSSDCalibration->SetBadChannels(badChannelsSSD);
+  //fSSDCalibration->FillBadChipMap();
+
 
-    Int_t iMod = i + fgkDefaultNModulesSPD + fgkDefaultNModulesSDD;
-    SetCalibrationModel(iMod, calibSSD);
 
- }
   return kTRUE;
 }
 //_______________________________________________________________________
@@ -807,13 +804,6 @@ void AliITSDetTypeSim::AddSumDigit(AliITSpListItem &sdig){
   new(fSDigits[fNSDigits++]) AliITSpListItem(sdig);
 }
 //__________________________________________________________
-void AliITSDetTypeSim::AddRealDigit(Int_t branch, Int_t *digits){
-  //   Add a real digit - as coming from data.
-
-  TClonesArray &ldigits = *((TClonesArray*)fDigits->At(branch));
-  new(ldigits[fNDigits[branch]++]) AliITSdigit(digits); 
-}
-//__________________________________________________________
 void AliITSDetTypeSim::AddSimDigit(Int_t branch, AliITSdigit* d){  
   //    Add a simulated digit.
 
@@ -832,20 +822,18 @@ void AliITSDetTypeSim::AddSimDigit(Int_t branch, AliITSdigit* d){
 }
 //______________________________________________________________________
 void AliITSDetTypeSim::AddSimDigit(Int_t branch,Float_t phys,Int_t *digits,
-                                  Int_t *tracks,Int_t *hits,Float_t *charges){
+                                  Int_t *tracks,Int_t *hits,Float_t *charges, 
+                                  Int_t sigexpanded){
   //   Add a simulated digit to the list.
 
   TClonesArray &ldigits = *((TClonesArray*)fDigits->At(branch));
-  AliITSCalibrationSDD *resp = 0;
   switch(branch){
   case 0:
     new(ldigits[fNDigits[branch]++]) AliITSdigitSPD(digits,tracks,hits);
     break;
   case 1:
-    resp = (AliITSCalibrationSDD*)GetCalibrationModel(
-       GetITSgeom()->GetStartSDD());
     new(ldigits[fNDigits[branch]++]) AliITSdigitSDD(phys,digits,tracks,
-                                                  hits,charges,resp);
+                                                  hits,charges,sigexpanded);
     break;
   case 2:
     new(ldigits[fNDigits[branch]++]) AliITSdigitSSD(digits,tracks,hits);
@@ -900,4 +888,75 @@ void AliITSDetTypeSim::StoreCalibration(Int_t firstRun, Int_t lastRun,
   AliCDBManager::Instance()->Put(&respSSD, idRespSSD, &md);
 }
 
+//______________________________________________________________________
+void AliITSDetTypeSim::ReadOldSSDNoise(TObjArray *array, 
+                                      AliITSNoiseSSDv2 *noiseSSD) {
+  //Reads the old SSD calibration object and converts it to the new format
+  const Int_t fgkSSDSTRIPSPERMODULE = 1536;
+  const Int_t fgkSSDPSIDESTRIPSPERMODULE = 768;
+
+  Int_t fNMod = array->GetEntries();
+  cout<<"Converting old calibration object for noise..."<<endl;
+
+  //NOISE
+  Double_t noise = 0.0;
+  for (Int_t iModule = 0; iModule < fNMod; iModule++) {
+    AliITSNoiseSSD *noiseModule = (AliITSNoiseSSD*) (array->At(iModule));
+    for(Int_t iStrip = 0; iStrip < fgkSSDSTRIPSPERMODULE; iStrip++) {
+      noise = (iStrip < fgkSSDPSIDESTRIPSPERMODULE) ? noiseModule->GetNoiseP(iStrip) : noiseModule->GetNoiseN(1535 - iStrip);
+      if(iStrip < fgkSSDPSIDESTRIPSPERMODULE)
+       noiseSSD->AddNoiseP(iModule,iStrip,noise);
+      if(iStrip >= fgkSSDPSIDESTRIPSPERMODULE)
+       noiseSSD->AddNoiseN(iModule,1535 - iStrip,noise);
+    }//loop over strips
+  }//loop over modules      
+}
+
+//______________________________________________________________________
+void AliITSDetTypeSim::ReadOldSSDBadChannels(TObjArray *array, 
+                                            AliITSBadChannelsSSDv2 *badChannelsSSD) {
+  //Reads the old SSD calibration object and converts it to the new format
+  Int_t fNMod = array->GetEntries();
+  cout<<"Converting old calibration object for bad channels..."<<endl;
+  for (Int_t iModule = 0; iModule < fNMod; iModule++) {
+    //for (Int_t iModule = 0; iModule < 1; iModule++) {
+    AliITSBadChannelsSSD *bad = (AliITSBadChannelsSSD*) (array->At(iModule));
+    TArrayI arrayPSide = bad->GetBadPChannelsList();
+    for(Int_t iPCounter = 0; iPCounter < arrayPSide.GetSize(); iPCounter++) 
+      badChannelsSSD->AddBadChannelP(iModule,
+                                    iPCounter,
+                                    (Char_t)arrayPSide.At(iPCounter));
+        
+    TArrayI arrayNSide = bad->GetBadNChannelsList();
+    for(Int_t iNCounter = 0; iNCounter < arrayNSide.GetSize(); iNCounter++) 
+      badChannelsSSD->AddBadChannelN(iModule,
+                                    iNCounter,
+                                    (Char_t)arrayNSide.At(iNCounter));
+    
+  }//loop over modules      
+}
+
+//______________________________________________________________________
+void AliITSDetTypeSim::ReadOldSSDGain(TObjArray *array, 
+                                     AliITSGainSSDv2 *gainSSD) {
+  //Reads the old SSD calibration object and converts it to the new format
+
+  Int_t fNMod = array->GetEntries();
+  cout<<"Converting old calibration object for gain..."<<endl;
+
+  //GAIN
+  for (Int_t iModule = 0; iModule < fNMod; iModule++) {
+    AliITSGainSSD *gainModule = (AliITSGainSSD*) (array->At(iModule));
+    TArrayF arrayPSide = gainModule->GetGainP();
+    for(Int_t iPCounter = 0; iPCounter < arrayPSide.GetSize(); iPCounter++)
+      gainSSD->AddGainP(iModule,
+                       iPCounter,
+                       arrayPSide.At(iPCounter));
+    TArrayF arrayNSide = gainModule->GetGainN();
+    for(Int_t iNCounter = 0; iNCounter < arrayNSide.GetSize(); iNCounter++)
+      gainSSD->AddGainN(iModule,
+                       iNCounter,
+                       arrayNSide.At(iNCounter));
+  }//loop over modules 
+}