Digitizer goes directly from photons to amplified charge

[u/mrichter/AliRoot.git] / AD / ADsim / AliADDigitizer.cxx

diff --git a/AD/ADsim/AliADDigitizer.cxx b/AD/ADsim/AliADDigitizer.cxx
index db8b8f70472102d56f907b8a79374edb3e689107..0fbde40ca71322203ab5dbcb7dd674d5369a38c1 100644 (file)
--- a/AD/ADsim/AliADDigitizer.cxx
+++ b/AD/ADsim/AliADDigitizer.cxx
@@ -171,7 +171,7 @@ Bool_t AliADDigitizer::Init()
   AliCTPTimeParams *ctpTimeAlign = (AliCTPTimeParams*)entry1->GetObject();
   l1Delay += ((Float_t)ctpTimeAlign->GetDelayL1L0()*25.0);
 
-  AliCDBEntry *entry2 = AliCDBManager::Instance()->Get("VZERO/Calib/TimeDelays");
+  AliCDBEntry *entry2 = AliCDBManager::Instance()->Get("AD/Calib/TimeDelays");
   if (!entry2) AliFatal("AD time delays are not found in OCDB !");
   TH1F *delays = (TH1F*)entry2->GetObject();
 
@@ -198,18 +198,14 @@ Bool_t AliADDigitizer::Init()
     fNBinsLT[i] = TMath::Nint(((Float_t)(fCalibData->GetMatchWindow(board)+1)*25.0)/
                              fCalibData->GetTimeResolution(board));
     fBinSize[i] = fCalibData->GetTimeResolution(board);
-    fHptdcOffset[i] = (((Float_t)fCalibData->GetRollOver(board)-
-                       (Float_t)fCalibData->GetTriggerCountOffset(board))*25.0+
-                      fCalibData->GetTimeOffset(i)-
-                      l1Delay-
-                      phase->GetMeanPhase()+
-                      delays->GetBinContent(i+1)+
-                      kV0Offset);
+
+    fHptdcOffset[i] =  delays->GetBinContent(i+1);
+                      
     fClockOffset[i] = (((Float_t)fCalibData->GetRollOver(board)-
                        (Float_t)fCalibData->GetTriggerCountOffset(board))*25.0+
                       fCalibData->GetTimeOffset(i)-
                       l1Delay+
-                      kV0Offset);
+                      kADOffset);
 
     fTime[i] = new Float_t[fNBins[i]];
     memset(fTime[i],0,fNBins[i]*sizeof(Float_t));
@@ -310,28 +306,19 @@ void AliADDigitizer::DigitizeHits()
           }
           Float_t dt_scintillator = gRandom->Gaus(0,kIntTimeRes);
           Float_t t = dt_scintillator + hit->GetTof();
-          //if (pmt < 32) t += kV0CDelayCables;
-          t += fHptdcOffset[pmt];
-          Int_t nPhE;
-          Float_t prob = fCalibData->GetLightYields(pmt)*kPhotoCathodeEfficiency; // Optical losses included!
-          if (nPhot > 100)
-            nPhE = (Int_t)gRandom->Gaus(prob*Float_t(nPhot)+0.5,
-                                        sqrt(Float_t(nPhot)*prob*(1.-prob)));
-          else
-            nPhE = gRandom->Binomial(nPhot,prob);
-          Float_t charge = TMath::Qe()*fPmGain[pmt]*fBinSize[pmt]/integral;
+          //t += fHptdcOffset[pmt];
           
-          
-          for (Int_t iPhE = 0; iPhE < nPhE; ++iPhE) {       
+          Float_t charge = nPhot*fPmGain[pmt]*fBinSize[pmt]/integral;
+            
             Float_t tPhE = t + fSignalShape->GetRandom(0,fBinSize[pmt]*Float_t(fNBins[pmt]));
-            Float_t gainVar = fSinglePhESpectrum->GetRandom(0,20)/meansPhE;
+            
             Int_t firstBin = TMath::Max(0,(Int_t)((tPhE-kPMRespTime)/fBinSize[pmt]));
             Int_t lastBin = TMath::Min(fNBins[pmt]-1,(Int_t)((tPhE+2.*kPMRespTime)/fBinSize[pmt]));
+            
             for(Int_t iBin = firstBin; iBin <= lastBin; ++iBin) {
               Float_t tempT = fBinSize[pmt]*(0.5+iBin)-tPhE;
-              fTime[pmt][iBin] += gainVar*charge*fPMResponse->Eval(tempT);
+              fTime[pmt][iBin] += charge*fPMResponse->Eval(tempT);
             }
-          }         // ph.e. loop
          }           // hit loop
      }               // track loop
      loader->UnloadHits();
@@ -351,12 +338,10 @@ void AliADDigitizer::DigitizeSDigits()
   Float_t integral2 = fSignalShape->Integral(0,200); // function. Anyway the effect is small <10% on the 2.5 ADC thr
   for (Int_t ipmt = 0; ipmt < 16; ++ipmt) {
     Float_t thr = fCalibData->GetCalibDiscriThr(ipmt,kFALSE)*kChargePerADC*maximum*fBinSize[ipmt]/integral2;
-    //Float_t thr = 1e-25;
        
     Bool_t ltFound = kFALSE, ttFound = kFALSE;
     for (Int_t iBin = 0; iBin < fNBins[ipmt]; ++iBin) {
       Float_t t = fBinSize[ipmt]*Float_t(iBin);
-      
       if (fTime[ipmt][iBin] > thr) {
        if (!ltFound && (iBin < fNBinsLT[ipmt])) {
          ltFound = kTRUE;
@@ -371,7 +356,8 @@ void AliADDigitizer::DigitizeSDigits()
          }
        }
       }
-      Float_t tadc = t - fClockOffset[ipmt];
+      //Float_t tadc = t - fClockOffset[ipmt];
+      Float_t tadc = t;
       Int_t clock = kNClocks/2 - Int_t(tadc/25.0);
       if (clock >= 0 && clock < kNClocks)
        fAdc[ipmt][clock] += fTime[ipmt][iBin]/kChargePerADC;
@@ -569,20 +555,26 @@ void AliADDigitizer::ResetDigits()
 AliADCalibData* AliADDigitizer::GetCalibData() const
 
 {
-/*/
-  AliCDBManager *man = AliCDBManager::Instance();
+AliCDBManager *man = AliCDBManager::Instance();
 
   AliCDBEntry *entry=0;
 
   entry = man->Get("AD/Calib/Data");
+  if(!entry){
+    AliWarning("Load of calibration data from default storage failed!");
+    AliWarning("Calibration data will be loaded from local storage ($ALICE_ROOT)");
+       
+    man->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+    man->SetRun(1);
+    entry = man->Get("AD/Calib/Data");
+  }
+  // Retrieval of data in directory AD/Calib/Data:
 
   AliADCalibData *calibdata = 0;
 
   if (entry) calibdata = (AliADCalibData*) entry->GetObject();
   if (!calibdata)  AliFatal("No calibration data from calibration database !");
-/*/
-  AliADCalibData *calibdata = new AliADCalibData();
-  
+
   return calibdata;
 
 }