Store in ESD mip Q as pTrk->SetRICHnclusters(100000*Q+nphots)

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

diff --git a/TOF/AliTOFDDLRawData.cxx b/TOF/AliTOFDDLRawData.cxx
index ab20eb09563b64fcdbf361e1e9e863a8e1020ff3..3705fc7993498589731e52481296b9520f1bfecb 100644 (file)
--- a/TOF/AliTOFDDLRawData.cxx
+++ b/TOF/AliTOFDDLRawData.cxx
@@ -33,20 +33,21 @@ Revision 0.01  2004/6/11 A.De Caro, S.B.Sellitto, R.Silvestri
 //
 //////////////////////////////////////////////////////////////////
 
-#include <stdlib.h>
-#include <Riostream.h>
-#include <TClonesArray.h>
-#include <TTree.h>
-#include <TMath.h>
-#include "AliLog.h"
+#include "Riostream.h"
+
+#include "TBranch.h"
+#include "TClonesArray.h"
+#include "TMath.h"
 
-#include "AliRawDataHeader.h"
 #include "AliBitPacking.h"
+#include "AliLog.h"
+#include "AliRawDataHeader.h"
 
-#include "AliTOFGeometry.h"
+#include "AliTOFDDLRawData.h"
 #include "AliTOFdigit.h"
+#include "AliTOFGeometry.h"
 #include "AliTOFRawStream.h"
-#include "AliTOFDDLRawData.h"
+#include "AliDAQ.h"
 
 ClassImp(AliTOFDDLRawData)
 
@@ -56,6 +57,16 @@ AliTOFDDLRawData::AliTOFDDLRawData()
   //Default constructor
   fIndex=-1;
   fVerbose=0;
+  fTOFgeometry = 0;
+}
+
+//----------------------------------------------------------------------------------------
+AliTOFDDLRawData::AliTOFDDLRawData(AliTOFGeometry *tofGeom)
+{
+  //Constructor
+  fIndex=-1;
+  fVerbose=0;
+  fTOFgeometry = tofGeom;
 }
 
 //----------------------------------------------------------------------------------------
@@ -65,6 +76,7 @@ AliTOFDDLRawData::AliTOFDDLRawData(const AliTOFDDLRawData &source) :
   //Copy Constructor
   this->fIndex=source.fIndex;
   this->fVerbose=source.fVerbose;
+  this->fTOFgeometry=source.fTOFgeometry;
   return;
 }
 
@@ -74,6 +86,7 @@ AliTOFDDLRawData& AliTOFDDLRawData::operator=(const AliTOFDDLRawData &source){
   //Assigment operator
   this->fIndex=source.fIndex;
   this->fVerbose=source.fVerbose;
+  this->fTOFgeometry=source.fTOFgeometry;
   return *this;
 }
 
@@ -84,7 +97,7 @@ void AliTOFDDLRawData::GetDigits(TClonesArray *TOFdigits,Int_t nDDL,UInt_t *buf)
 
   //This method packs the TOF digits in a proper 32 bits structure
 
-  Int_t iDDL    = nDDL%AliTOFGeometry::NDDL();//(Int_t)((nDDL/4.-(Int_t)(nDDL/4.))*4);
+  Int_t iDDL    = nDDL%AliTOFGeometry::NDDL();
   Int_t iSector = (Int_t)((Float_t)nDDL/AliTOFGeometry::NDDL());
   Int_t iTRM = 0;
   Int_t iTDC = 0;
@@ -118,8 +131,9 @@ void AliTOFDDLRawData::GetDigits(TClonesArray *TOFdigits,Int_t nDDL,UInt_t *buf)
     strip  = digs->GetStrip();  // Strip Number (0-14/18/19)
     padx   = digs->GetPadx();   // Pad Number in x direction (0-47)
     padz   = digs->GetPadz();   // Pad Number in z direction (0-1)
-    eureka = digs->GetTotPad(); // Global Pad Number inside a Sector
-    totCharge = (Int_t)digs->GetAdc();
+    eureka = digs->GetTotPad(fTOFgeometry); // Global Pad Number inside a Sector
+    //   totCharge = (Int_t)digs->GetAdc(); //Use realistic ToT, for Standard  production with no miscalibration/Slewing it == fAdC in digit (see AliTOFDigitizer)
+    totCharge = (Int_t)digs->GetToT();
     timeOfFlight = (Int_t)digs->GetTdc();
 
     if (sector!=iSector || (Int_t)((Float_t)eureka/AliTOFGeometry::NPadXTRM()/AliTOFGeometry::NTRM())!=iDDL) continue;
@@ -151,7 +165,6 @@ void AliTOFDDLRawData::GetDigits(TClonesArray *TOFdigits,Int_t nDDL,UInt_t *buf)
 
     if (fVerbose==2) ftxt << "DDL: "<<nDDL<<" TRM: "<<iTRM<<" TDC: "<<iTDC<<" Channel: "<<iCH<<" totCharge: "<<totCharge<<" tof: "<<timeOfFlight<<endl;
 
-    //AliInfo(Form("%2i %2i %2i %2i   %2i %2i %2i %2i %2i %7i %8i",nDDL,iTRM,iTDC,iCH,sector,plate,strip,padz,padx,totCharge,timeOfFlight));
     AliDebug(2,Form("%2i %2i %2i %2i   %2i %2i %2i %2i %2i %7i %8i",nDDL,iTRM,iTDC,iCH,sector,plate,strip,padz,padx,totCharge,timeOfFlight));
     
     baseWord=0;
@@ -220,7 +233,7 @@ Int_t AliTOFDDLRawData::RawDataTOF(TBranch* branch){
   //loop over TOF DDL files
   for(Int_t i = 0; i<AliTOFGeometry::NDDL()*AliTOFGeometry::NSectors(); i++){
 
-    sprintf(fileName,"TOF_%d.ddl",i+AliTOFRawStream::kDDLOffset); //The name of the output file
+    strcpy(fileName,AliDAQ::DdlFileName("TOF",i)); //The name of the output file
 #ifndef __DECCXX
     outfile.open(fileName,ios::binary);
 #else