X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=TOF%2FAliTOFDigitizer.cxx;h=aa9eb3dc8b62d921556ac9cc94df5a2314ec35d6;hp=2ad3022c96c58aaad10c9d9ec242f858a0c2067d;hb=5b37b1ddbba0ecd034c2fd671e3745e8cb85e201;hpb=d0eb8f39d01038f3fd0d3655c61d06fb9677e39b

diff --git a/TOF/AliTOFDigitizer.cxx b/TOF/AliTOFDigitizer.cxx
index 2ad3022c96c..aa9eb3dc8b6 100644
--- a/TOF/AliTOFDigitizer.cxx
+++ b/TOF/AliTOFDigitizer.cxx
@@ -25,30 +25,32 @@
 //                                                                         //
 //_________________________________________________________________________//
 
-#include "Riostream.h"
+//#include "Riostream.h"
 
-#include "TFile.h"
+//#include "TFile.h"
+#include "TMath.h"
 #include "TH1F.h"
 #include "TTree.h"
+#include "TRandom.h"
+#include "TObjArray.h"
 
 #include "AliLoader.h"
 #include "AliLog.h"
-#include "AliRunDigitizer.h"
+#include "AliDigitizationInput.h"
 #include "AliRunLoader.h"
 #include "AliRun.h"
 
-#include "AliTOFCal.h"
 #include "AliTOFcalib.h"
-#include "AliTOFChannel.h"
+//#include "AliTOFChannelOnlineArray.h"
+//#include "AliTOFChannelOnlineStatusArray.h"
+//#include "AliTOFChannelOffline.h"
 #include "AliTOFDigitizer.h"
 #include "AliTOFdigit.h"
 #include "AliTOFHitMap.h"
-#include "AliTOFGeometryV5.h"
+#include "AliTOFGeometry.h"
 #include "AliTOFSDigit.h"
 #include "AliTOF.h"
 
-extern TDirectory *gDirectory;
-extern TFile *gFile;
 extern TRandom *gRandom;
 
 extern AliRun *gAlice;
@@ -57,46 +59,53 @@ extern AliRun *gAlice;
 ClassImp(AliTOFDigitizer)
 
 //___________________________________________
-  AliTOFDigitizer::AliTOFDigitizer()  :AliDigitizer()
+  AliTOFDigitizer::AliTOFDigitizer()  :
+    AliDigitizer(),
+    fDigits(new TClonesArray("AliTOFdigit",4000)),
+    fSDigitsArray(new TClonesArray("AliTOFSDigit",1000)),
+  fhitMap(0x0),
+  fCalib(new AliTOFcalib())
 {
   // Default ctor - don't use it
-  fDigits=0;
-  fSDigitsArray=0;
-  fhitMap=0;
-  fGeom=0x0; 
+  InitDecalibration();
 }
 
 //___________________________________________
-AliTOFDigitizer::AliTOFDigitizer(AliRunDigitizer* manager) 
-    :AliDigitizer(manager) 
+AliTOFDigitizer::AliTOFDigitizer(AliDigitizationInput* digInput): 
+  AliDigitizer(digInput), 
+  fDigits(new TClonesArray("AliTOFdigit",4000)),
+  fSDigitsArray(new TClonesArray("AliTOFSDigit",1000)),
+  fhitMap(0x0),
+  fCalib(new AliTOFcalib())
 {
   //ctor with RunDigitizer
-  fDigits=0;
-  fSDigitsArray=0;
-  fhitMap=0;
-  fGeom=0x0; 
+  InitDecalibration();
 }
 
 //------------------------------------------------------------------------
-AliTOFDigitizer::AliTOFDigitizer(const AliTOFDigitizer &source)
-  :AliDigitizer(source)
+AliTOFDigitizer::AliTOFDigitizer(const AliTOFDigitizer &source):
+  AliDigitizer(source),
+  fDigits(source.fDigits),
+  fSDigitsArray(source.fSDigitsArray),
+  fhitMap(source.fhitMap),
+  fCalib(source.fCalib)
 {
   // copy constructor
-  this->fDigits=source.fDigits;
-  this->fSDigitsArray=source.fSDigitsArray;
-  this->fhitMap=source.fhitMap;
-  this->fGeom=source.fGeom; 
-
 }
 
 //------------------------------------------------------------------------
   AliTOFDigitizer& AliTOFDigitizer::operator=(const AliTOFDigitizer &source)
 {
   // ass. op.
-  this->fDigits=source.fDigits;
-  this->fSDigitsArray=source.fSDigitsArray;
-  this->fhitMap=source.fhitMap;
-  this->fGeom=source.fGeom; 
+  
+  if (this == &source)
+    return *this;
+
+  AliDigitizer::operator=(source);
+  fDigits=source.fDigits;
+  fSDigitsArray=source.fSDigitsArray;
+  fhitMap=source.fhitMap;
+  fCalib=source.fCalib;
   return *this;
 
 }
@@ -105,11 +114,22 @@ AliTOFDigitizer::AliTOFDigitizer(const AliTOFDigitizer &source)
 AliTOFDigitizer::~AliTOFDigitizer()
 {
   // Destructor
+  delete fCalib;
+  if (fDigits){
+    fDigits->Delete();
+    delete fDigits;
+    fDigits=0x0;
+  }
+  if (fSDigitsArray){
+    fSDigitsArray->Delete();
+    delete fSDigitsArray;
+    fSDigitsArray=0x0;
+  }
 }
 
 //---------------------------------------------------------------------
 
-void AliTOFDigitizer::Exec(Option_t* /*option*/)
+void AliTOFDigitizer::Digitize(Option_t* /*option*/)
 {
   //
   // Perform digitization and merging.
@@ -128,33 +148,18 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/)
   AliTOF * tof = (AliTOF *) gAlice->GetDetector("TOF") ;
 
   //Make branches
-  char branchname[20];
-  sprintf (branchname, "%s", tof->GetName ());
 
-  fDigits=new TClonesArray("AliTOFdigit",4000);
+  const Int_t kSize = 20;
+  char branchname[kSize];
+  snprintf(branchname,kSize,"%s", tof->GetName ());
  
-  AliRunLoader* outrl = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
+  AliRunLoader* outrl = AliRunLoader::GetRunLoader(fDigInput->GetOutputFolderName());
   if (outrl == 0x0)
    {
      AliError("Can not find Run Loader in output folder.");
      return;
    }
    
-  outrl->CdGAFile();
-  TFile *in=(TFile*)gFile;
-  TDirectory *savedir=gDirectory;
-
-  if (!in->IsOpen()) {
-    AliWarning("Geometry file is not open default  TOF geometry will be used");
-    fGeom = new AliTOFGeometryV5();
-  }
-  else {
-    in->cd();
-    fGeom = (AliTOFGeometry*)in->Get("TOFgeometry");
-  }
-
-  savedir->cd();
-
   AliLoader* outgime = outrl->GetLoader("TOFLoader");
   if (outgime == 0x0)
    {
@@ -172,14 +177,14 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/)
   tof->MakeBranchInTree(treeD,branchname,&fDigits,4000);
 
   // container for all summed sdigits (to be created in Init())
-  fSDigitsArray=new TClonesArray("AliTOFSDigit",1000);
+  //fSDigitsArray=new TClonesArray("AliTOFSDigit",1000);
   
   // create hit map (to be created in Init())
-  fhitMap = new AliTOFHitMap(fSDigitsArray, fGeom);
+  fhitMap = new AliTOFHitMap(fSDigitsArray);
   
   // Loop over files to digitize
 
-  for (Int_t inputFile=0; inputFile<fManager->GetNinputs();
+  for (Int_t inputFile=0; inputFile<fDigInput->GetNinputs();
        inputFile++) {
     ReadSDigit(inputFile);
    }
@@ -189,15 +194,17 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/)
 
   // free used memory for Hit Map in current event
   delete fhitMap;
-  fSDigitsArray->Delete();
-  delete fSDigitsArray;
+  fSDigitsArray->Clear();
 
   treeD->Fill();
- 
+
+  AliDebug(2,"----------------------------------------");
+  AliDebug(1,Form("%d digits have been created", fDigits->GetEntriesFast()));
+  AliDebug(2,"----------------------------------------");
+
   outgime->WriteDigits("OVERWRITE");
   outgime->UnloadDigits();
-  fDigits->Delete();
-  delete fDigits;
+  fDigits->Clear();
 
 }
 
@@ -213,9 +220,13 @@ void AliTOFDigitizer::CreateDigits()
   // get the total number of collected sdigits
   Int_t ndig = fSDigitsArray->GetEntriesFast();
 
+  Int_t  vol[5]={-1,-1,-1,-1,-1};  // location for a digit
+  Int_t  digit[4] = {0,0,0,0};     // TOF digit variables
+  Int_t tracknum[AliTOFSDigit::kMAXDIGITS]; // contributing tracks for the current slot
+  for (Int_t aa=0; aa<AliTOFSDigit::kMAXDIGITS; aa++) tracknum[aa] = -1;
+
   for (Int_t k = 0; k < ndig; k++) {
     
-    Int_t  vol[5];  // location for a digit
     for (Int_t i=0; i<5; i++) vol[i] = -1;
     
     // Get the information for this digit
@@ -241,28 +252,27 @@ void AliTOFDigitizer::CreateDigits()
     // in the while, I perform QA
     Bool_t isSDigitBad = (sector<0 || sector>17 || plate<0 || plate >4 || padz<0 || padz>1 || padx<0 || padx>47);
     
-    if (isSDigitBad) {
-      //AliFatal("strange sdigit found");
-      AliFatal(Form("strange sdigit found   %3i  %2i  %2i  %3i    %3i", sector, plate, padz, padx, strip));
-    }
+    if (isSDigitBad)
+      AliFatal(Form("strange sdigit found   %2d  %1d  %2d  %1d %2d", sector, plate, strip, padz, padx));
     //-------------------------------------------------------
     
     //------------------- Dump section ----------------------
-    if(k<ndump){
-      cout << k << "-th | " << "Sector " << sector << " | Plate " << plate << " | Strip " << strip << " | PadZ " << padz << " | PadX " << padx << endl;
-      cout << k << "-th sdigit" << endl;
-      cout << "----------------------------------------------------"<< endl;
+    if (k<ndump) {
+      AliInfo(Form("%2d-th digit: Sector %2d | Plate %1d | Strip %2d | PadZ %1d | PadX %2d ", k, sector, plate, strip, padz, padx));
+      AliInfo("----------------------------------------------------");
     }
     // ------------------------------------------------------
     
     // start loop on number of slots for current sdigit
     for (Int_t islot = 0; islot < nslot; islot++) {
-      Float_t  digit[4] = {-1.,-1.,-1.,-1.};     // TOF digit variables
-      Int_t tracknum[AliTOFSDigit::kMAXDIGITS];     // contributing tracks for the current slot
-      
-      Float_t tdc=tofsdigit->GetTdc(islot); digit[0]=tdc;
-      Float_t adc=tofsdigit->GetAdc(islot); digit[1]=adc;
+      for (Int_t aa=0; aa<4; aa++) digit[aa] = 0; // TOF digit variables
+      for (Int_t aa=0; aa<AliTOFSDigit::kMAXDIGITS; aa++) tracknum[aa] = -1;
       
+      Int_t tdc=tofsdigit->GetTdc(islot); digit[0]=tdc;
+      Int_t adc=tofsdigit->GetAdc(islot); digit[1]=adc;
+
+      //if (tdc>=8192) continue;//AdC
+
       tracknum[0]=tofsdigit->GetTrack(islot,0);
       tracknum[1]=tofsdigit->GetTrack(islot,1);
       tracknum[2]=tofsdigit->GetTrack(islot,2);
@@ -278,11 +288,8 @@ void AliTOFDigitizer::CreateDigits()
   } // end loop on sdigits - end digitizing all collected sdigits
 
   //Insert Decalibration 
-
-  AliTOFcalib * calib = new AliTOFcalib(fGeom);
-  InitDecalibration(calib);
-  DecalibrateTOFSignal(calib);
-  delete calib;
+  AliDebug(2,"in digitizer, create digits");
+  DecalibrateTOFSignal();
 }
 
 //---------------------------------------------------------------------
@@ -295,8 +302,12 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile )
   // SDigits from different files are assumed to
   // be created with the same simulation parameters.
   
-  // get the treeS from manager
-  AliRunLoader* rl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(inputFile));
+  // creating the TClonesArray to store the digits
+  static TClonesArray sdigitsClonesArray("AliTOFSDigit",  1000); 
+  sdigitsClonesArray.Clear();
+
+  // get the treeS from digInput
+  AliRunLoader* rl = AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(inputFile));
   if (rl == 0x0)
    {
      AliError(Form("Can not find Run Loader in input %d folder.",inputFile));
@@ -327,13 +338,13 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile )
       }
    } 
   // get the branch TOF inside the treeS
-  TClonesArray * sdigitsDummyContainer= new TClonesArray("AliTOFSDigit",  1000); 
-
+  TClonesArray * sdigitsDummyContainer=&sdigitsClonesArray;
   // check if the branch exist
   TBranch* tofBranch=currentTreeS->GetBranch("TOF");
 
   if(!tofBranch){
     AliFatal(Form("TOF branch not found for input %d",inputFile));
+    return;
   }
   
   tofBranch->SetAddress(&sdigitsDummyContainer);           
@@ -343,6 +354,9 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile )
   // Loop through all entries in the tree
   Int_t nbytes = 0;
   
+  Int_t  vol[5]; // location for a sdigit
+  for (Int_t i=0; i<5; i++) vol[i] = -1;
+
   for (Int_t iEntry = 0; iEntry < nEntries; iEntry++) {
     
     // Import the tree
@@ -354,7 +368,6 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile )
     for (Int_t k=0; k<ndig; k++) {
       AliTOFSDigit *tofSdigit= (AliTOFSDigit*) sdigitsDummyContainer->UncheckedAt(k);
       
-      Int_t  vol[5]; // location for a sdigit
       for (Int_t i=0; i<5; i++) vol[i] = -1;
 
       // check the sdigit volume
@@ -376,17 +389,14 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile )
       } // if (hitMap->TestHit(vol) != kEmpty)
       
     } // for (Int_t k=0; k<ndig; k++)
-    sdigitsDummyContainer->Delete();
 
   } // end loop on entries
 
-  delete sdigitsDummyContainer;
-
 }
 
 
 //_____________________________________________________________________________
-void AliTOFDigitizer::CollectSDigit(AliTOFSDigit * sdigit)
+void AliTOFDigitizer::CollectSDigit(const AliTOFSDigit * const sdigit)
 {
   //
   // Add a TOF sdigit in container
@@ -399,36 +409,90 @@ void AliTOFDigitizer::CollectSDigit(AliTOFSDigit * sdigit)
 }
 
 //_____________________________________________________________________________
-void AliTOFDigitizer::InitDecalibration( AliTOFcalib *calib) const {
-  // calib->ReadSimParFromCDB("TOF/Calib", 0); // original
-  calib->ReadSimParFromCDB("TOF/Calib", -1); // use AliCDBManager's number
+void AliTOFDigitizer::InitDecalibration() const {
+  //
+  // Initialize TOF digits decalibration
+  //
+
+  fCalib->Init();
+  /*
+  fCalib->CreateCalArrays();
+  fCalib->ReadSimHistoFromCDB("TOF/Calib", -1); // use AliCDBManager's number
+  fCalib->ReadParOfflineFromCDB("TOF/Calib", -1); // use AliCDBManager's number
+  */
 }
 //---------------------------------------------------------------------
-void AliTOFDigitizer::DecalibrateTOFSignal( AliTOFcalib *calib){
+void AliTOFDigitizer::DecalibrateTOFSignal() {
+  //
+  // Decalibrate TOF signals according to OCDB parameters
+  //
 
-  // Read Calibration parameters from the CDB
+  Double_t time=0., tot=0., corr=0.;
+  Int_t deltaBC=0, l0l1=0, tdcBin=0;
+  Int_t index = -1;
+  Int_t detId[5] ={-1,-1,-1,-1,-1};
+  UInt_t timestamp=0;
 
-  AliTOFCal * cal= calib->GetTOFCalSimArray();
+  Int_t ndigits = fDigits->GetEntriesFast();
+  // Loop on TOF Digits
+  for (Int_t i=0;i<ndigits;i++){
+    AliTOFdigit * dig = (AliTOFdigit*)fDigits->At(i);
+    detId[0] = dig->GetSector();
+    detId[1] = dig->GetPlate();
+    detId[2] = dig->GetStrip();
+    detId[3] = dig->GetPadz();
+    detId[4] = dig->GetPadx();
+    dig->SetTdcND(dig->GetTdc()); // save the non decalibrated time
+
+    index = AliTOFGeometry::GetIndex(detId); // The channel index    
+
+    // Read Calibration parameters from the CDB
+    // get digit info
+    time = dig->GetTdc() * AliTOFGeometry::TdcBinWidth(); /* ps */
+    tot = dig->GetToT() * AliTOFGeometry::ToTBinWidth() * 1.e-3; /* ns */
+    deltaBC = 0;//dig->GetDeltaBC();
+    l0l1 = 0;//dig->GetL0L1Latency();
+
+    // get correction
+    corr = fCalib->GetTimeCorrection(index, tot, deltaBC, l0l1, timestamp); /* ps */
+    AliDebug(2, Form("calibrate index %d: time=%f (ps) tot=%f (ns) deltaBC=%d l0l1=%d timestamp=%d corr=%f (ps)",
+		     index, time, tot, deltaBC, l0l1, timestamp, corr));
+
+    // apply time correction
+    time += corr;
+
+    // convert in TDC bins and set digit
+    //tdcBin = (Int_t)(time / AliTOFGeometry::TdcBinWidth()); //the corrected time (tdc counts)
+    tdcBin = TMath::Nint(time / AliTOFGeometry::TdcBinWidth()); //the corrected time (tdc counts)
+    dig->SetTdc(tdcBin);
 
-  AliInfo(Form("Size of AliTOFCal = %i",cal->NPads()));
-  for (Int_t ipad = 0 ; ipad<cal->NPads(); ipad++){
-    AliTOFChannel *calChannel = cal->GetChannel(ipad);
-    Float_t par[6];
-    for (Int_t j = 0; j<6; j++){
-      par[j]=calChannel->GetSlewPar(j);
-    }
   }
 
-  // Initialize Quantities to Simulate ToT Spectra
+  AliDebug(1,"Simulating miscalibrated digits");
 
+  return;
+}
+
+//---------------------------------------------------------------------
+/*
+void AliTOFDigitizer::DecalibrateTOFSignal(){ // Old implementation
 
-  TH1F * hToT= calib->GetTOFSimToT();
+  // Read Calibration parameters from the CDB
+
+  TObjArray * calOffline= fCalib->GetTOFCalArrayOffline();
+
+  AliDebug(2,Form("Size of array for Offline Calibration = %i",calOffline->GetEntries()));
+
+  // Initialize Quantities to Simulate ToT Spectra
+
+  TH1F * hToT= fCalib->GetTOFSimToT();
   Int_t nbins = hToT->GetNbinsX();
   Float_t delta = hToT->GetBinWidth(1);
   Float_t maxch = hToT->GetBinLowEdge(nbins)+delta;
   Float_t minch = hToT->GetBinLowEdge(1);
   Float_t max=0,min=0; //maximum and minimum value of the distribution
   Int_t maxbin=0,minbin=0; //maximum and minimum bin of the distribution
+
   for (Int_t ii=nbins; ii>0; ii--){
     if (hToT->GetBinContent(ii)!= 0) {
       max = maxch - (nbins-ii-1)*delta;
@@ -441,15 +505,22 @@ void AliTOFDigitizer::DecalibrateTOFSignal( AliTOFcalib *calib){
       minbin = j; 
       break;}
   }
+
   Float_t maxToT=max;
   Float_t minToT=min;
+ 
   Float_t maxToTDistr=hToT->GetMaximum();
-  
 
+  AliDebug (1, Form(" The minimum ToT = %f", minToT)); 
+  AliDebug (1, Form(" The maximum ToT = %f", maxToT)); 
+  AliDebug (1, Form(" The maximum peak in ToT = %f", maxToTDistr)); 
+  
   // Loop on TOF Digits
 
-  Bool_t dbEntry=kFALSE;
-  Int_t ndigits = fDigits->GetEntriesFast();    
+  Bool_t isToTSimulated=kFALSE;
+  Bool_t misCalibPars=kFALSE;
+  if(hToT->GetEntries()>0)isToTSimulated=kTRUE;  
+  Int_t ndigits = fDigits->GetEntriesFast();
   for (Int_t i=0;i<ndigits;i++){
     AliTOFdigit * dig = (AliTOFdigit*)fDigits->At(i);
     Int_t detId[5];
@@ -458,12 +529,32 @@ void AliTOFDigitizer::DecalibrateTOFSignal( AliTOFcalib *calib){
     detId[2] = dig->GetStrip();
     detId[3] = dig->GetPadz();
     detId[4] = dig->GetPadx();
-    // For Data with no Miscalibration, set ToT signal == Adc
-    dig->SetToT(dig->GetAdc());
-    if(hToT->GetEntries()>0){  
+    dig->SetTdcND(dig->GetTdc()); // save the non decalibrated time
+    if(isToTSimulated){  
+
+      //A realistic ToT Spectrum was found in input, 
+      //decalibrated TOF Digits likely to be simulated....
+ 
+      Int_t index = AliTOFGeometry::GetIndex(detId); // The channel index    
+      AliTOFChannelOffline *calChannelOffline = (AliTOFChannelOffline *)calOffline->At(index); //retrieve the info for time slewing 
+      Double_t par[6];  // time slewing parameters
+  
+      //check whether we actually ask for miscalibration
+
+      for (Int_t j = 0; j<6; j++){
+	par[j]=(Double_t)calChannelOffline->GetSlewPar(j);
+	if(par[j]!=0)misCalibPars=kTRUE;
+      }
+      AliDebug(2,Form(" Calib Pars = %f (0-th parameter for time slewing + time delay), %f, %f, %f, %f, %f ",par[0],par[1],par[2],par[3],par[4],par[5]));
+
+      // Now generate Realistic ToT distribution from TestBeam Data. 
+      // Tot is in ns, assuming a Matching Window of 10 ns.
+
+      Float_t simToT = 0;
       Float_t trix = 0;
       Float_t triy = 0;
-      Float_t simToT = 0;
+      Double_t timeCorr;
+      Double_t tToT;
       while (simToT <= triy){
 	trix = gRandom->Rndm(i);
 	triy = gRandom->Rndm(i);
@@ -472,32 +563,51 @@ void AliTOFDigitizer::DecalibrateTOFSignal( AliTOFcalib *calib){
 	Int_t binx=hToT->FindBin(trix);
 	simToT=hToT->GetBinContent(binx);
       }
-    // Setting realistic ToT signal (only for Miscalibrated Data)   
-      dig->SetToT(trix);
+      // the generated ToT (ns)
+      tToT= (Double_t) trix; // to apply slewing we start from ns..
+      // transform TOF signal in ns
+      AliDebug(2,Form(" The Initial Time (counts): %i: ",dig->GetTdc()));
+      AliDebug(2,Form(" Time before miscalibration (ps) %e: ",dig->GetTdc()*(Double_t)AliTOFGeometry::TdcBinWidth()));
+      // add slewing effect
+      timeCorr=par[0] + tToT*(par[1] +tToT*(par[2] +tToT*(par[3] +tToT*(par[4] +tToT*par[5])))); 
+      AliDebug(2,Form(" The Time slewing + delay (ns): %f: ",timeCorr));
+      // add global time shift
+      //convert to ps
+      timeCorr*=1E3;
+      Double_t timeMis = (Double_t)(dig->GetTdc())*(Double_t)AliTOFGeometry::TdcBinWidth();
+      timeMis = timeMis+timeCorr;
+      AliDebug(2,Form(" The Miscalibrated time (ps): %e: ",timeMis));
+
+      // now update the digit info
+ 
+      Int_t tdcCorr= (Int_t)(timeMis/AliTOFGeometry::TdcBinWidth());
+      AliDebug(2,Form(" Final Time (counts): %i: ",tdcCorr));
+      // Setting Decalibrated Time signal (TDC counts)    
+      dig->SetTdc(tdcCorr);   
+      // Setting realistic ToT signal (TDC counts) 
+      tToT*=1E3; //back to ps  
+      Int_t tot=(Int_t)(tToT/AliTOFGeometry::ToTBinWidth());//(factor 1E3 as input ToT is in ns)
+      dig->SetToT(tot); 
+      AliDebug(2,Form(" Final Time and ToT (counts): %d: , %d:",dig->GetTdc(),dig->GetToT()));
+      if(tdcCorr<0){
+	AliWarning (Form(" The bad Slewed Time(TDC counts)= %d ", tdcCorr)); 
+	AliWarning(Form(" The bad ToT (TDC counts)= %d ", tot)); 
+      }
     }
-    Int_t index = calib->GetIndex(detId);     
-    AliTOFChannel *calChannel = cal->GetChannel(index);
-    Float_t par[6];
-    for (Int_t j = 0; j<6; j++){
-      par[j]=calChannel->GetSlewPar(j);
-      if(par[j]!=0)dbEntry=kTRUE;
+    else{
+    // For Data with no Miscalibration, set ToT signal == Adc
+      dig->SetToT((Int_t)(dig->GetAdc()/AliTOFGeometry::ToTBinWidth())); //remove the factor 10^3 just to have a reasonable ToT range for raw data simulation even in the case of non-realistic ToT distribution (n.b. fAdc is practically an arbitrary quantity, and ToT has no impact on the TOF reco for non-miscalibrated digits)
     }
-
-    Float_t tToT= dig->GetToT();
-    dig->SetTdcND(dig->GetTdc());
-    Float_t tdc = ((dig->GetTdc())*AliTOFGeometry::TdcBinWidth()+32)*1.E-3; //tof signal in ns
-    Float_t timeoffset=par[0] + tToT*(par[1] +tToT*(par[2] +tToT*(par[3] +tToT*(par[4] +tToT*par[5])))); 
-    Float_t timeSlewed = tdc + timeoffset;
-    // Setting Decalibrated Time signal    
-    dig->SetTdc((timeSlewed*1E3-32)/AliTOFGeometry::TdcBinWidth());   
   }
 
-  if(hToT->GetEntries()<=0 || !dbEntry){
-    AliInfo("Standard Production, no miscalibrated digits");   
-  }else{
-    AliInfo("Miscalibrated digits");   
-  }
+  if(!isToTSimulated)
+    AliDebug(1,"Standard Production, no miscalibrated digits");
+  else
+    if(!misCalibPars)
+      AliDebug(1,"Standard Production, no miscalibrated digits");
+    else
+      AliDebug(1,"Simulating miscalibrated digits");
 
   return;
 }
-
+*/