Change to extended data arrays for all MCM channels and rename GetDataB to GetDataBits

[u/mrichter/AliRoot.git] / TOF / AliTOFDigitizer.cxx

diff --git a/TOF/AliTOFDigitizer.cxx b/TOF/AliTOFDigitizer.cxx
index 4491819fcfd35a72dc2c25e832f2a38a6a3b6c6a..fb7bc8a04644679b5b87ec5d1f2f279fe10a707d 100644 (file)
--- a/TOF/AliTOFDigitizer.cxx
+++ b/TOF/AliTOFDigitizer.cxx
@@ -97,10 +97,15 @@ AliTOFDigitizer::AliTOFDigitizer(const AliTOFDigitizer &source):
   AliTOFDigitizer& AliTOFDigitizer::operator=(const AliTOFDigitizer &source)
 {
   // ass. op.
-  this->fDigits=source.fDigits;
-  this->fSDigitsArray=source.fSDigitsArray;
-  this->fhitMap=source.fhitMap;
-  this->fCalib=source.fCalib;
+  
+  if (this == &source)
+    return *this;
+
+  AliDigitizer::operator=(source);
+  fDigits=source.fDigits;
+  fSDigitsArray=source.fSDigitsArray;
+  fhitMap=source.fhitMap;
+  fCalib=source.fCalib;
   return *this;
 
 }
@@ -153,25 +158,6 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/)
      return;
    }
    
-  /*
-  outrl->CdGAFile();
-  TFile *in=(TFile*)gFile;
-  TDirectory *savedir=gDirectory;
-
-   
-  //when fGeom was needed
-
-  if (!in->IsOpen()) {
-    AliWarning("Geometry file is not open default  TOF geometry will be used");
-    fGeom = new AliTOFGeometry();
-  }
-  else {
-    in->cd();
-    fGeom = (AliTOFGeometry*)in->Get("TOFgeometry");
-  }
-  
-  savedir->cd();
-  */
   AliLoader* outgime = outrl->GetLoader("TOFLoader");
   if (outgime == 0x0)
    {
@@ -189,7 +175,7 @@ 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);
@@ -206,11 +192,14 @@ 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,"----------------------------------------");
+  AliInfo(Form("%d digits have been created", fDigits->GetEntriesFast()));
+  AliDebug(2,"----------------------------------------");
+
   outgime->WriteDigits("OVERWRITE");
   outgime->UnloadDigits();
   fDigits->Clear();
@@ -257,16 +246,13 @@ 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){
-      AliInfo(Form("%2i-th | Sector %2i | Plate %1i | Strip %2i | PadZ %1i | PadX %2i ", k, sector, plate, strip, padz, padx));
-      AliInfo(Form("%2i-th", k));
+    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("----------------------------------------------------");
     }
     // ------------------------------------------------------
@@ -278,7 +264,9 @@ void AliTOFDigitizer::CreateDigits()
       
       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);
@@ -294,7 +282,7 @@ void AliTOFDigitizer::CreateDigits()
   } // end loop on sdigits - end digitizing all collected sdigits
 
   //Insert Decalibration 
-  AliInfo("in digitizer, create digits");
+  AliDebug(2,"in digitizer, create digits");
   DecalibrateTOFSignal();
 }
 
@@ -535,10 +523,10 @@ void AliTOFDigitizer::DecalibrateTOFSignal(){
       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): %i: , %i:",dig->GetTdc(),dig->GetToT()));
+      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)= %i ", tdcCorr)); 
-       AliWarning(Form(" The bad ToT (TDC counts)= %i ", tot)); 
+       AliWarning (Form(" The bad Slewed Time(TDC counts)= %d ", tdcCorr)); 
+       AliWarning(Form(" The bad ToT (TDC counts)= %d ", tot)); 
       }
     }
     else{
@@ -547,16 +535,14 @@ void AliTOFDigitizer::DecalibrateTOFSignal(){
     }
   }
 
-  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");   
-    } 
-  }
+  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;
 }