X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOF.cxx;h=94634a99f8f089cb5de1ee04464375b33a1e1da5;hb=3f61e9cee1845a88b275d7e23f5c3f7246562431;hp=ed395b751d6d8b4eaec3d2c31432154c360e6ca3;hpb=7ca4655fc9c861260bd2b42a5de05a36f9574d60;p=u%2Fmrichter%2FAliRoot.git diff --git a/TOF/AliTOF.cxx b/TOF/AliTOF.cxx index ed395b751d6..94634a99f8f 100644 --- a/TOF/AliTOF.cxx +++ b/TOF/AliTOF.cxx @@ -12,7 +12,6 @@ * about the suitability of this software for any purpose. It is * * provided "as is" without express or implied warranty. * **************************************************************************/ - /* $Id$ */ /////////////////////////////////////////////////////////////////////////////// @@ -46,14 +45,17 @@ #include #include #include +#include #include "AliConst.h" #include "AliLoader.h" #include "AliLog.h" #include "AliMC.h" #include "AliRun.h" +#include "AliDAQ.h" +#include "AliRawReader.h" -#include "AliTOFDDLRawData.h" +//#include "AliTOFDDLRawData.h" #include "AliTOFDigitizer.h" #include "AliTOFdigit.h" #include "AliTOFhitT0.h" @@ -62,6 +64,8 @@ #include "AliTOFSDigitizer.h" #include "AliTOFSDigit.h" #include "AliTOF.h" +#include "AliTOFrawData.h" +#include "AliTOFRawStream.h" class AliTOFcluster; @@ -71,9 +75,8 @@ extern TVirtualMC *gMC; extern AliRun *gAlice; - ClassImp(AliTOF) - + //_____________________________________________________________________________ AliTOF::AliTOF(): fFGeom(0x0), @@ -84,14 +87,21 @@ AliTOF::AliTOF(): fReconParticles(0x0), fIdSens(-1), fTZero(kFALSE), - fTOFGeometry(0x0) + fTOFHoles(kTRUE), + fTOFGeometry(0x0), + fTOFRawWriter(AliTOFDDLRawData()) { // // Default constructor // + + //by default all sectors switched on + for (Int_t ii=0; ii<18; ii++) fTOFSectors[ii]=0; + fDigits = 0; fIshunt = 0; fName = "TOF"; + } //_____________________________________________________________________________ @@ -106,7 +116,9 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option) fReconParticles(0x0), fIdSens(-1), fTZero(kFALSE), - fTOFGeometry(0x0) + fTOFHoles(kTRUE), + fTOFGeometry(0x0), + fTOFRawWriter(AliTOFDDLRawData()) { // // AliTOF standard constructor @@ -119,6 +131,9 @@ AliTOF::AliTOF(const char *name, const char *title, Option_t *option) //skowron fTOFGeometry = new AliTOFGeometry(); + //by default all sectors switched on + for (Int_t ii=0; ii<18; ii++) fTOFSectors[ii]=0; + if (strstr(option,"tzero")){ fHits = new TClonesArray("AliTOFhitT0", 1000); fTZero = kTRUE; @@ -178,38 +193,6 @@ void AliTOF::GetTOFSectors(Int_t *sectors) const sectors[isec]=fTOFSectors[isec]; } } -//_____________________________________________________________________________ -AliTOF::AliTOF(const AliTOF &source) - :AliDetector(), - fFGeom(0x0), - fDTask(0x0), - fReTask(0x0), - fSDigits(0x0), - fNSDigits(0), - fReconParticles(0x0), - fIdSens(-1), - fTZero(kFALSE), - fTOFGeometry(0x0) -{ - // copy constructor - - this->fReconParticles=source.fReconParticles; - this->fSDigits=source.fSDigits; - this->fTOFGeometry=source.fTOFGeometry; - -} - -//_____________________________________________________________________________ -AliTOF& AliTOF::operator=(const AliTOF &source) -{ - // ass. op. - - this->fReconParticles=source.fReconParticles; - this->fSDigits=source.fSDigits; - this->fTOFGeometry=source.fTOFGeometry; - return *this; - -} //_____________________________________________________________________________ void AliTOF::CreateTOFFolders() @@ -318,7 +301,7 @@ void AliTOF::AddT0Hit(Int_t track, Int_t *vol, Float_t *hits) } //_____________________________________________________________________________ -void AliTOF::AddDigit(Int_t *tracks, Int_t *vol, Float_t *digits) +void AliTOF::AddDigit(Int_t *tracks, Int_t *vol, Int_t *digits) { // // Add a TOF digit @@ -329,7 +312,7 @@ void AliTOF::AddDigit(Int_t *tracks, Int_t *vol, Float_t *digits) } //_____________________________________________________________________________ -void AliTOF::AddSDigit(Int_t tracknum, Int_t *vol, Float_t *digits) +void AliTOF::AddSDigit(Int_t tracknum, Int_t *vol, Int_t *digits) { // @@ -403,7 +386,16 @@ void AliTOF::CreateGeometry() Float_t xTof, yTof; - if (IsVersion()==7) { + if (IsVersion()==8) { + + xTof = 124.5;//fTOFGeometry->StripLength()+2.*(0.3+0.03); // cm, x-dimension of FTOA volume + yTof = fTOFGeometry->Rmax()-fTOFGeometry->Rmin(); // cm, y-dimension of FTOA volume + Float_t zTof = fTOFGeometry->ZlenA(); // cm, z-dimension of FTOA volume + + // TOF module internal definitions + TOFpc(xTof, yTof, zTof); + + } else if (IsVersion()==7) { xTof = 124.5;//fTOFGeometry->StripLength()+2.*(0.3+0.03); // cm, x-dimension of FTOA volume yTof = fTOFGeometry->Rmax()-fTOFGeometry->Rmin(); // cm, y-dimension of FTOA volume @@ -461,15 +453,6 @@ void AliTOF::DrawModule() const gMC->Gdopt("hide","off"); } -//_____________________________________________________________________________ -Int_t AliTOF::DistancetoPrimitive(Int_t , Int_t ) -{ - // - // Returns distance from mouse pointer to detector, default version - // - return 9999; -} - //___________________________________________ void AliTOF::ResetHits () { @@ -506,7 +489,7 @@ void AliTOF::Init() /* // Save the geometry TDirectory* saveDir = gDirectory; - gAlice->GetRunLoader()->CdGAFile(); + AliRunLoader::Instance()->CdGAFile(); fTOFGeometry->Write("TOFGeometry"); saveDir->cd(); */ @@ -595,10 +578,16 @@ void AliTOF::Hits2SDigits() // AliInfo("Start..."); AliRunLoader * rl = fLoader->GetRunLoader(); + AliDebug(2,"Initialized runLoader"); AliTOFSDigitizer sd((rl->GetFileName()).Data()); - ToAliDebug(1, sd.Print("")); + AliDebug(2,"Initialized TOF sdigitizer"); + //ToAliDebug(1, sd.Print("")); + //AliInfo("ToAliDebug"); - sd.Exec("") ; + //sd.Exec("all") ; + sd.Exec("partial") ; + + AliDebug(2,"I am sorting from AliTOF class"); } @@ -610,10 +599,9 @@ void AliTOF::Hits2SDigits(Int_t evNumber1, Int_t evNumber2) // if ((evNumber2-evNumber1)==1) - AliDebug(1, Form("I am making sdigits for the %dth event", evNumber1)) - else if ((evNumber2-evNumber1)>1) - AliDebug(1, Form("I am making sdigits for the events from the " - "%dth to the %dth", evNumber1, evNumber2-1)); + AliDebug(1, Form("I am making sdigits for the %dth event", evNumber1)); + if ((evNumber2-evNumber1)>1) + AliDebug(1, Form("I am making sdigits for the events from the %dth to the %dth", evNumber1, evNumber2-1)); AliRunLoader * rl = fLoader->GetRunLoader(); AliTOFSDigitizer sd((rl->GetFileName()).Data(),evNumber1,evNumber2) ; @@ -626,11 +614,12 @@ void AliTOF::Hits2SDigits(Int_t evNumber1, Int_t evNumber2) //___________________________________________________________________________ AliDigitizer* AliTOF::CreateDigitizer(AliRunDigitizer* manager) const { + AliDebug(2,"I am creating the TOF digitizer"); return new AliTOFDigitizer(manager); } //___________________________________________________________________________ -Bool_t AliTOF::CheckOverlap(Int_t* vol, Float_t* digit,Int_t Track) +Bool_t AliTOF::CheckOverlap(Int_t* vol, Int_t* digit,Int_t Track) { // // Checks if 2 or more hits belong to the same pad. @@ -654,8 +643,8 @@ Bool_t AliTOF::CheckOverlap(Int_t* vol, Float_t* digit,Int_t Track) if (vol[i]!=vol2[i]) idem=kFALSE;} if (idem){ // same pad fired - Float_t tdc2 = digit[0]; - Float_t tdc1 = currentDigit->GetTdc(); + Int_t tdc2 = digit[0]; + Int_t tdc1 = currentDigit->GetTdc(); // we separate two digits on the same pad if // they are separated in time by at least 25 ns @@ -675,7 +664,7 @@ Bool_t AliTOF::CheckOverlap(Int_t* vol, Float_t* digit,Int_t Track) overlap = kTRUE; return overlap; } else - overlap= kFALSE; + overlap= kFALSE; } // close if (idem) -> two digits on the same TOF pad @@ -690,6 +679,9 @@ void AliTOF::Digits2Raw() // Starting from the TOF digits, writes the Raw Data objects // + TStopwatch stopwatch; + stopwatch.Start(); + fLoader->LoadDigits(); TTree* digits = fLoader->TreeD(); @@ -698,22 +690,24 @@ void AliTOF::Digits2Raw() return; } - //AliRunLoader *rl = AliRunLoader::Open("galice.root",AliConfig::GetDefaultEventFolderName(),"read"); - fRunLoader->CdGAFile(); - TFile *in=(TFile*)gFile; - in->cd(); - AliTOFGeometry *geometry = (AliTOFGeometry*)in->Get("TOFgeometry"); - - AliTOFDDLRawData rawWriter(geometry); //AliTOFDDLRawData rawWriter; - rawWriter.SetVerbose(0); + fTOFRawWriter.Clear(); + fTOFRawWriter.SetVerbose(0); + if (fTOFRawWriter.GetPackedAcquisitionMode()) { + if(fTOFRawWriter.GetMatchingWindow()>8192) + AliWarning(Form("You are running in packing mode and the matching window is %.2f ns, i.e. greater than 199.8848 ns", + fTOFRawWriter.GetMatchingWindow()*AliTOFGeometry::TdcBinWidth()*1.e-03)); + } AliDebug(1,"Formatting raw data for TOF"); digits->GetEvent(0); - rawWriter.RawDataTOF(digits->GetBranch("TOF")); + fTOFRawWriter.RawDataTOF(digits->GetBranch("TOF")); fLoader->UnloadDigits(); + AliDebug(1, Form("Execution time to write TOF raw data : R:%.2fs C:%.2fs", + stopwatch.RealTime(),stopwatch.CpuTime())); + } //____________________________________________________________________________ @@ -722,8 +716,7 @@ void AliTOF::RecreateSDigitsArray() { // delete TClonesArray fSDigits and create it again // needed for backward compatability with PPR test production // - delete fSDigits; - fSDigits = new TClonesArray("AliTOFSDigit", 1000); + fSDigits->Clear(); } //____________________________________________________________________________ void AliTOF::CreateSDigitsArray() { @@ -733,3 +726,58 @@ void AliTOF::CreateSDigitsArray() { // fSDigits = new TClonesArray("AliTOFSDigit", 1000); } +//____________________________________________________________________________ +Bool_t AliTOF::Raw2SDigits(AliRawReader* rawReader) +{ + // + // Converts raw data to sdigits for TOF + // + + TStopwatch stopwatch; + stopwatch.Start(); + + if(!GetLoader()->TreeS()) {MakeTree("S"); MakeBranch("S");} + //TClonesArray &aSDigits = *fSDigits; + + AliTOFRawStream tofRawStream = AliTOFRawStream(); + tofRawStream.Raw2SDigits(rawReader, fSDigits); + + GetLoader()->TreeS()->Fill(); GetLoader()->WriteSDigits("OVERWRITE");//write out sdigits + Int_t nSDigits = fSDigits->GetEntries(); + + ResetSDigits(); + + AliDebug(1, Form("Got %d TOF sdigits", nSDigits)); + AliDebug(1, Form("Execution time to read TOF raw data and fill TOF sdigit tree : R:%.2fs C:%.2fs", + stopwatch.RealTime(),stopwatch.CpuTime())); + + return kTRUE; + +} + +//____________________________________________________________________________ +void AliTOF::Raw2Digits(AliRawReader* rawReader) +{ + // + // Converts raw data to digits for TOF + // + + TStopwatch stopwatch; + stopwatch.Start(); + + if(!GetLoader()->TreeD()) {MakeTree("D"); MakeBranch("D");} + //TClonesArray &aDigits = *fDigits; + + AliTOFRawStream tofRawStream = AliTOFRawStream(); + tofRawStream.Raw2Digits(rawReader, fDigits); + + GetLoader()->TreeD()->Fill(); GetLoader()->WriteDigits("OVERWRITE");//write out digits + Int_t nDigits = fDigits->GetEntries(); + + ResetDigits(); + + AliDebug(1, Form("Got %d TOF digits", nDigits)); + AliDebug(1, Form("Execution time to read TOF raw data and fill TOF digit tree : R:%.2fs C:%.2fs", + stopwatch.RealTime(),stopwatch.CpuTime())); + +}