// 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"
#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)
fHeadersFile(""),
fRunLoader(0x0),
fTOFLoader(0x0),
- fTOFGeometry(new AliTOFGeometry()),
fSelectedSector(-1),
fSelectedPlate(-1),
fTimeResolution(0),
fHeadersFile(""),
fRunLoader(0x0),
fTOFLoader(0x0),
- fTOFGeometry(0x0),
fSelectedSector(-1),
fSelectedPlate(-1),
fTimeResolution(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;
}
fHeadersFile(HeaderFile), // input filename (with hits)
fRunLoader(0x0),
fTOFLoader(0x0),
- fTOFGeometry(0x0),
fSelectedSector(-1), // by default we sdigitize all sectors
fSelectedPlate(-1), // by default we sdigitize all plates in all sectors
fTimeResolution(0),
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();
in->cd();
fTOFGeometry = (AliTOFGeometry*)in->Get("TOFgeometry");
}
-
+
savedir->cd();
-
+ */
if (fRunLoader->TreeE() == 0x0) fRunLoader->LoadHeader();
if (evNumber1>=0) fEvent1 = evNumber1;
// dtor
fTOFLoader->CleanSDigitizer();
- delete fTOFGeometry;
-
}
//____________________________________________________________________________
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");
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;
// 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();