Ignoring smell subdet

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

diff --git a/TOF/AliTOFSDigitizer.cxx b/TOF/AliTOFSDigitizer.cxx
index 6ab959ddada20fba2cb03f625dbb70bb82e24e01..d42404bd296f69c28e9e8fdc25e1015a038a6bcf 100644 (file)
--- a/TOF/AliTOFSDigitizer.cxx
+++ b/TOF/AliTOFSDigitizer.cxx
@@ -26,11 +26,14 @@
 //   Use case: see AliTOFhits2sdigits.C macro in the CVS    //
 //__________________________________________________________//
 
-#include "TBenchmark.h"
-#include "TF1.h"
-#include "TFile.h"
-#include "TParticle.h"
-#include "TTree.h"
+#include <TBenchmark.h>
+#include <TClonesArray.h>
+#include <TF1.h>
+#include <TFile.h>
+#include <TParticle.h>
+#include <TTree.h>
+#include <TRandom.h>
+#include <TROOT.h>
 
 #include "AliLoader.h"
 #include "AliLog.h"
@@ -46,62 +49,153 @@
 #include "AliTOFSDigit.h"
 #include "AliTOF.h"
 
-extern TBenchmark *gBenchmark;
-extern TDirectory *gDirectory;
-extern TFile *gFile;
-extern TRandom *gRandom;
-extern TROOT *gROOT;
-
-extern AliRun *gAlice;
-
 
 ClassImp(AliTOFSDigitizer)
 
 //____________________________________________________________________________ 
-  AliTOFSDigitizer::AliTOFSDigitizer():TTask("TOFSDigitizer","") 
+AliTOFSDigitizer::AliTOFSDigitizer():
+  TTask("TOFSDigitizer",""),
+  fEvent1(-1),
+  fEvent2(-1),
+  ftail(0x0),
+  fHeadersFile(""),
+  fRunLoader(0x0),
+  fTOFLoader(0x0),
+  fSelectedSector(-1), 
+  fSelectedPlate(-1),
+  fTimeResolution(0),
+  fpadefficiency(0),
+  fEdgeEffect(-1),
+  fEdgeTails(-1),
+  fHparameter(0),
+  fH2parameter(0),
+  fKparameter(0),
+  fK2parameter(0),
+  fEffCenter(0),
+  fEffBoundary(0),
+  fEff2Boundary(0),
+  fEff3Boundary(0),
+  fAddTRes(0),
+  fResCenter(0),
+  fResBoundary(0),
+  fResSlope(0),
+  fTimeWalkCenter(0),
+  fTimeWalkBoundary(0),
+  fTimeWalkSlope(0),
+  fTimeDelayFlag(-1),
+  fPulseHeightSlope(0),
+  fTimeDelaySlope(0),
+  fMinimumCharge(0),
+  fChargeSmearing(0),
+  fLogChargeSmearing(0),
+  fTimeSmearing(0),
+  fAverageTimeFlag(-1),
+  fAdcBin(0),
+  fAdcMean(0),
+  fAdcRms(0)
 {
   // ctor
-
-  fRunLoader      = 0;
-  fTOFLoader      = 0;
-
-  fEvent1         = 0;
-  fEvent2         = 0;
-  ftail           = 0;
-  fSelectedSector = -1;
-  fSelectedPlate  = -1;
-
-  fTOFGeometry = new AliTOFGeometry();
-
 }
 
 //------------------------------------------------------------------------
-AliTOFSDigitizer::AliTOFSDigitizer(const AliTOFSDigitizer &source)
-  :TTask(source)
+AliTOFSDigitizer::AliTOFSDigitizer(const AliTOFSDigitizer &source):
+  TTask(source),
+  fEvent1(-1),
+  fEvent2(-1),
+  ftail(0x0),
+  fHeadersFile(""),
+  fRunLoader(0x0),
+  fTOFLoader(0x0),
+  fSelectedSector(-1), 
+  fSelectedPlate(-1),
+  fTimeResolution(0),
+  fpadefficiency(0),
+  fEdgeEffect(-1),
+  fEdgeTails(-1),
+  fHparameter(0),
+  fH2parameter(0),
+  fKparameter(0),
+  fK2parameter(0),
+  fEffCenter(0),
+  fEffBoundary(0),
+  fEff2Boundary(0),
+  fEff3Boundary(0),
+  fAddTRes(0),
+  fResCenter(0),
+  fResBoundary(0),
+  fResSlope(0),
+  fTimeWalkCenter(0),
+  fTimeWalkBoundary(0),
+  fTimeWalkSlope(0),
+  fTimeDelayFlag(-1),
+  fPulseHeightSlope(0),
+  fTimeDelaySlope(0),
+  fMinimumCharge(0),
+  fChargeSmearing(0),
+  fLogChargeSmearing(0),
+  fTimeSmearing(0),
+  fAverageTimeFlag(-1),
+  fAdcBin(0),
+  fAdcMean(0),
+  fAdcRms(0)
 {
   // copy constructor
-  this->fTOFGeometry=source.fTOFGeometry;
+  //this->fTOFGeometry=source.fTOFGeometry;
 
 }
 
 //____________________________________________________________________________ 
-AliTOFSDigitizer& AliTOFSDigitizer::operator=(const AliTOFSDigitizer &source)
+AliTOFSDigitizer& AliTOFSDigitizer::operator=(const AliTOFSDigitizer &/*source*/)
 {
   // ass. op.
-  this->fTOFGeometry=source.fTOFGeometry;
   return *this;
 
 }
 
 //____________________________________________________________________________ 
-AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_t nEvents):TTask("TOFSDigitizer","")
+AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_t nEvents):
+  TTask("TOFSDigitizer",""),
+  fEvent1(-1),
+  fEvent2(-1),
+  ftail(0x0),
+  fHeadersFile(HeaderFile), // input filename (with hits)
+  fRunLoader(0x0),
+  fTOFLoader(0x0),
+  fSelectedSector(-1), // by default we sdigitize all sectors
+  fSelectedPlate(-1),  // by default we sdigitize all plates in all sectors
+  fTimeResolution(0),
+  fpadefficiency(0),
+  fEdgeEffect(-1),
+  fEdgeTails(-1),
+  fHparameter(0),
+  fH2parameter(0),
+  fKparameter(0),
+  fK2parameter(0),
+  fEffCenter(0),
+  fEffBoundary(0),
+  fEff2Boundary(0),
+  fEff3Boundary(0),
+  fAddTRes(0),
+  fResCenter(0),
+  fResBoundary(0),
+  fResSlope(0),
+  fTimeWalkCenter(0),
+  fTimeWalkBoundary(0),
+  fTimeWalkSlope(0),
+  fTimeDelayFlag(-1),
+  fPulseHeightSlope(0),
+  fTimeDelaySlope(0),
+  fMinimumCharge(0),
+  fChargeSmearing(0),
+  fLogChargeSmearing(0),
+  fTimeSmearing(0),
+  fAverageTimeFlag(-1),
+  fAdcBin(0),
+  fAdcMean(0),
+  fAdcRms(0)
 {
   //ctor, reading from input file 
-  ftail    = 0;
-  fSelectedSector=-1; // by default we sdigitize all sectors
-  fSelectedPlate =-1; // by default we sdigitize all plates in all sectors
   
-  fHeadersFile = HeaderFile ; // input filename (with hits)
   TFile * file = (TFile*) gROOT->GetFile(fHeadersFile.Data());
   
   //File was not opened yet open file and get alirun object
@@ -121,10 +215,13 @@ AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_
       return;
     }
 
+  /*
   fRunLoader->CdGAFile();
   TDirectory *savedir=gDirectory;
   TFile *in=(TFile*)gFile;
 
+   
+// when fTOFGeometry was needed
   if (!in->IsOpen()) {
     AliWarning("Geometry file is not open default TOF geometry will be used");
     fTOFGeometry = new AliTOFGeometry();
@@ -133,9 +230,9 @@ AliTOFSDigitizer::AliTOFSDigitizer(const char* HeaderFile, Int_t evNumber1, Int_
     in->cd();
     fTOFGeometry = (AliTOFGeometry*)in->Get("TOFgeometry");
   }
-
+  
   savedir->cd();
-
+  */
   if (fRunLoader->TreeE() == 0x0) fRunLoader->LoadHeader();
   
   if (evNumber1>=0) fEvent1 = evNumber1;
@@ -170,8 +267,6 @@ AliTOFSDigitizer::~AliTOFSDigitizer()
   // dtor
   fTOFLoader->CleanSDigitizer();
 
-  delete fTOFGeometry;
-
 }
 
 //____________________________________________________________________________ 
@@ -303,7 +398,8 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
     TClonesArray *tofHitArray = tof->Hits();
 
     // create hit map
-    AliTOFHitMap *hitMap = new AliTOFHitMap(tof->SDigits(), fTOFGeometry);
+    //    AliTOFHitMap *hitMap = new AliTOFHitMap(tof->SDigits(), fTOFGeometry);
+    AliTOFHitMap *hitMap = new AliTOFHitMap(tof->SDigits());
 
     TBranch * tofHitsBranch = hitTree->GetBranch("TOF");
 
@@ -329,7 +425,7 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
 
       for (Int_t hit = 0; hit < nhits; hit++) {
        Int_t    vol[5];       // location for a digit
-       Float_t  digit[2];     // TOF digit variables
+       Int_t  digit[2];     // TOF digit variables
        Int_t tracknum;
        Float_t dxPad;
        Float_t dzPad;
@@ -337,7 +433,7 @@ void AliTOFSDigitizer::Exec(Option_t *verboseOption) {
 
        // fp: really sorry for this, it is a temporary trick to have
        // track length too
-       if(version!=6 && version!=7){
+       if (version<6) { //(version!=6 && version!=7)
          AliTOFhit *tofHit = (AliTOFhit *) tofHitArray->UncheckedAt(hit);
          tracknum = tofHit->GetTrack();
          vol[0] = tofHit->GetSector();