X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TOF%2FAliTOFDigitizer.cxx;h=0f310678fa6ded3ffe3079d9f886fec05e5e717c;hb=3a40bd00400f0821f86fa0cc88479fc35883dcd0;hp=089dcf22ec9db933d3bbef538e988f8417ef4ece;hpb=6f26effb348cbedb3987ed2960fb6a823f0fddf1;p=u%2Fmrichter%2FAliRoot.git diff --git a/TOF/AliTOFDigitizer.cxx b/TOF/AliTOFDigitizer.cxx index 089dcf22ec9..0f310678fa6 100644 --- a/TOF/AliTOFDigitizer.cxx +++ b/TOF/AliTOFDigitizer.cxx @@ -25,12 +25,13 @@ // // //_________________________________________________________________________// -#include "Riostream.h" +//#include "Riostream.h" -#include "TFile.h" +//#include "TFile.h" #include "TH1F.h" #include "TTree.h" #include "TRandom.h" +#include "TObjArray.h" #include "AliLoader.h" #include "AliLog.h" @@ -38,18 +39,18 @@ #include "AliRunLoader.h" #include "AliRun.h" -#include "AliTOFCal.h" #include "AliTOFcalib.h" -#include "AliTOFChannel.h" +//#include "AliTOFChannelOnline.h" +#include "AliTOFChannelOffline.h" #include "AliTOFDigitizer.h" #include "AliTOFdigit.h" #include "AliTOFHitMap.h" -#include "AliTOFGeometryV5.h" +#include "AliTOFGeometry.h" #include "AliTOFSDigit.h" #include "AliTOF.h" extern TDirectory *gDirectory; -extern TFile *gFile; +//extern TFile *gFile; extern TRandom *gRandom; extern AliRun *gAlice; @@ -60,49 +61,51 @@ ClassImp(AliTOFDigitizer) //___________________________________________ AliTOFDigitizer::AliTOFDigitizer() : AliDigitizer(), - fGeom(0x0), - fDigits(0x0), - fSDigitsArray(0x0), - fhitMap(0x0) + fDigits(new TClonesArray("AliTOFdigit",4000)), + fSDigitsArray(new TClonesArray("AliTOFSDigit",1000)), + fhitMap(0x0), + fCalib(new AliTOFcalib()) { // Default ctor - don't use it + InitDecalibration(); } //___________________________________________ AliTOFDigitizer::AliTOFDigitizer(AliRunDigitizer* manager): AliDigitizer(manager), - fGeom(0x0), - fDigits(0x0), - fSDigitsArray(0x0), - fhitMap(0x0) + fDigits(new TClonesArray("AliTOFdigit",4000)), + fSDigitsArray(new TClonesArray("AliTOFSDigit",1000)), + fhitMap(0x0), + fCalib(new AliTOFcalib()) { //ctor with RunDigitizer + InitDecalibration(); } //------------------------------------------------------------------------ AliTOFDigitizer::AliTOFDigitizer(const AliTOFDigitizer &source): AliDigitizer(source), - fGeom(0x0), - fDigits(0), - fSDigitsArray(0), - fhitMap(0) + fDigits(source.fDigits), + fSDigitsArray(source.fSDigitsArray), + fhitMap(source.fhitMap), + fCalib(source.fCalib) { // copy constructor - this->fDigits=source.fDigits; - this->fSDigitsArray=source.fSDigitsArray; - this->fhitMap=source.fhitMap; - this->fGeom=source.fGeom; - } //------------------------------------------------------------------------ AliTOFDigitizer& AliTOFDigitizer::operator=(const AliTOFDigitizer &source) { // ass. op. - this->fDigits=source.fDigits; - this->fSDigitsArray=source.fSDigitsArray; - this->fhitMap=source.fhitMap; - this->fGeom=source.fGeom; + + if (this == &source) + return *this; + + AliDigitizer::operator=(source); + fDigits=source.fDigits; + fSDigitsArray=source.fSDigitsArray; + fhitMap=source.fhitMap; + fCalib=source.fCalib; return *this; } @@ -111,6 +114,17 @@ AliTOFDigitizer::AliTOFDigitizer(const AliTOFDigitizer &source): AliTOFDigitizer::~AliTOFDigitizer() { // Destructor + delete fCalib; + if (fDigits){ + fDigits->Delete(); + delete fDigits; + fDigits=0x0; + } + if (fSDigitsArray){ + fSDigitsArray->Delete(); + delete fSDigitsArray; + fSDigitsArray=0x0; + } } //--------------------------------------------------------------------- @@ -136,8 +150,6 @@ void AliTOFDigitizer::Exec(Option_t* /*option*/) //Make branches char branchname[20]; sprintf (branchname, "%s", tof->GetName ()); - - fDigits=new TClonesArray("AliTOFdigit",4000); AliRunLoader* outrl = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName()); if (outrl == 0x0) @@ -146,21 +158,25 @@ 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 AliTOFGeometryV5(); + fGeom = new AliTOFGeometry(); } else { in->cd(); fGeom = (AliTOFGeometry*)in->Get("TOFgeometry"); } - + savedir->cd(); - + */ AliLoader* outgime = outrl->GetLoader("TOFLoader"); if (outgime == 0x0) { @@ -178,10 +194,10 @@ 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, fGeom); + fhitMap = new AliTOFHitMap(fSDigitsArray); // Loop over files to digitize @@ -195,15 +211,13 @@ 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(); outgime->WriteDigits("OVERWRITE"); outgime->UnloadDigits(); - fDigits->Delete(); - delete fDigits; + fDigits->Clear(); } @@ -263,12 +277,14 @@ void AliTOFDigitizer::CreateDigits() // start loop on number of slots for current sdigit for (Int_t islot = 0; islot < nslot; islot++) { - Float_t digit[4] = {-1.,-1.,-1.,-1.}; // TOF digit variables + Int_t digit[4] = {-1,-1,-1,-1}; // TOF digit variables Int_t tracknum[AliTOFSDigit::kMAXDIGITS]; // contributing tracks for the current slot - Float_t tdc=tofsdigit->GetTdc(islot); digit[0]=tdc; - Float_t adc=tofsdigit->GetAdc(islot); digit[1]=adc; - + 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); @@ -284,11 +300,8 @@ void AliTOFDigitizer::CreateDigits() } // end loop on sdigits - end digitizing all collected sdigits //Insert Decalibration - - AliTOFcalib * calib = new AliTOFcalib(fGeom); - InitDecalibration(calib); - DecalibrateTOFSignal(calib); - delete calib; + AliInfo("in digitizer, create digits"); + DecalibrateTOFSignal(); } //--------------------------------------------------------------------- @@ -301,6 +314,10 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile ) // SDigits from different files are assumed to // be created with the same simulation parameters. + // creating the TClonesArray to store the digits + static TClonesArray sdigitsClonesArray("AliTOFSDigit", 1000); + sdigitsClonesArray.Clear(); + // get the treeS from manager AliRunLoader* rl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(inputFile)); if (rl == 0x0) @@ -333,8 +350,7 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile ) } } // get the branch TOF inside the treeS - TClonesArray * sdigitsDummyContainer= new TClonesArray("AliTOFSDigit", 1000); - + TClonesArray * sdigitsDummyContainer=&sdigitsClonesArray; // check if the branch exist TBranch* tofBranch=currentTreeS->GetBranch("TOF"); @@ -382,12 +398,9 @@ void AliTOFDigitizer::ReadSDigit(Int_t inputFile ) } // if (hitMap->TestHit(vol) != kEmpty) } // for (Int_t k=0; kDelete(); } // end loop on entries - delete sdigitsDummyContainer; - } @@ -405,36 +418,34 @@ void AliTOFDigitizer::CollectSDigit(AliTOFSDigit * sdigit) } //_____________________________________________________________________________ -void AliTOFDigitizer::InitDecalibration( AliTOFcalib *calib) const { - // calib->ReadSimParFromCDB("TOF/Calib", 0); // original - calib->ReadSimParFromCDB("TOF/Calib", -1); // use AliCDBManager's number +void AliTOFDigitizer::InitDecalibration() const { + // + // + // + + fCalib->CreateCalArrays(); + fCalib->ReadSimHistoFromCDB("TOF/Calib", -1); // use AliCDBManager's number + fCalib->ReadParOfflineFromCDB("TOF/Calib", -1); // use AliCDBManager's number } //--------------------------------------------------------------------- -void AliTOFDigitizer::DecalibrateTOFSignal( AliTOFcalib *calib){ +void AliTOFDigitizer::DecalibrateTOFSignal(){ // Read Calibration parameters from the CDB - AliTOFCal * cal= calib->GetTOFCalSimArray(); + TObjArray * calOffline= fCalib->GetTOFCalArrayOffline(); - AliDebug(2,Form("Size of AliTOFCal = %i",cal->NPads())); - for (Int_t ipad = 0 ; ipadNPads(); ipad++){ - AliTOFChannel *calChannel = cal->GetChannel(ipad); - Float_t par[6]; - for (Int_t j = 0; j<6; j++){ - par[j]=calChannel->GetSlewPar(j); - } - } + AliDebug(2,Form("Size of array for Offline Calibration = %i",calOffline->GetEntries())); // Initialize Quantities to Simulate ToT Spectra - - TH1F * hToT= calib->GetTOFSimToT(); + TH1F * hToT= fCalib->GetTOFSimToT(); Int_t nbins = hToT->GetNbinsX(); Float_t delta = hToT->GetBinWidth(1); Float_t maxch = hToT->GetBinLowEdge(nbins)+delta; Float_t minch = hToT->GetBinLowEdge(1); Float_t max=0,min=0; //maximum and minimum value of the distribution Int_t maxbin=0,minbin=0; //maximum and minimum bin of the distribution + for (Int_t ii=nbins; ii>0; ii--){ if (hToT->GetBinContent(ii)!= 0) { max = maxch - (nbins-ii-1)*delta; @@ -447,15 +458,22 @@ void AliTOFDigitizer::DecalibrateTOFSignal( AliTOFcalib *calib){ minbin = j; break;} } + Float_t maxToT=max; Float_t minToT=min; + Float_t maxToTDistr=hToT->GetMaximum(); - + AliDebug (1, Form(" The minimum ToT = %f", minToT)); + AliDebug (1, Form(" The maximum ToT = %f", maxToT)); + AliDebug (1, Form(" The maximum peak in ToT = %f", maxToTDistr)); + // Loop on TOF Digits - Bool_t dbEntry=kFALSE; - Int_t ndigits = fDigits->GetEntriesFast(); + Bool_t isToTSimulated=kFALSE; + Bool_t misCalibPars=kFALSE; + if(hToT->GetEntries()>0)isToTSimulated=kTRUE; + Int_t ndigits = fDigits->GetEntriesFast(); for (Int_t i=0;iAt(i); Int_t detId[5]; @@ -464,12 +482,32 @@ void AliTOFDigitizer::DecalibrateTOFSignal( AliTOFcalib *calib){ detId[2] = dig->GetStrip(); detId[3] = dig->GetPadz(); detId[4] = dig->GetPadx(); - // For Data with no Miscalibration, set ToT signal == Adc - dig->SetToT(dig->GetAdc()/AliTOFGeometry::ToTBinWidth()*1.E3); - if(hToT->GetEntries()>0){ + dig->SetTdcND(dig->GetTdc()); // save the non decalibrated time + if(isToTSimulated){ + + //A realistic ToT Spectrum was found in input, + //decalibrated TOF Digits likely to be simulated.... + + Int_t index = AliTOFGeometry::GetIndex(detId); // The channel index + AliTOFChannelOffline *calChannelOffline = (AliTOFChannelOffline *)calOffline->At(index); //retrieve the info for time slewing + Double_t par[6]; // time slewing parameters + + //check whether we actually ask for miscalibration + + for (Int_t j = 0; j<6; j++){ + par[j]=(Double_t)calChannelOffline->GetSlewPar(j); + if(par[j]!=0)misCalibPars=kTRUE; + } + AliDebug(2,Form(" Calib Pars = %f (0-th parameter for time slewing + time delay), %f, %f, %f, %f, %f ",par[0],par[1],par[2],par[3],par[4],par[5])); + + // Now generate Realistic ToT distribution from TestBeam Data. + // Tot is in ns, assuming a Matching Window of 10 ns. + + Float_t simToT = 0; Float_t trix = 0; Float_t triy = 0; - Float_t simToT = 0; + Double_t timeCorr; + Double_t tToT; while (simToT <= triy){ trix = gRandom->Rndm(i); triy = gRandom->Rndm(i); @@ -478,41 +516,53 @@ void AliTOFDigitizer::DecalibrateTOFSignal( AliTOFcalib *calib){ Int_t binx=hToT->FindBin(trix); simToT=hToT->GetBinContent(binx); } - // Setting realistic ToT signal (only for Miscalibrated Data) - dig->SetToT(trix/AliTOFGeometry::ToTBinWidth()*1.E3); //In ToT is in ns.. + // the generated ToT (ns) + tToT= (Double_t) trix; // to apply slewing we start from ns.. + // transform TOF signal in ns + AliDebug(2,Form(" The Initial Time (counts): %i: ",dig->GetTdc())); + AliDebug(2,Form(" Time before miscalibration (ps) %e: ",dig->GetTdc()*(Double_t)AliTOFGeometry::TdcBinWidth())); + // add slewing effect + timeCorr=par[0] + tToT*(par[1] +tToT*(par[2] +tToT*(par[3] +tToT*(par[4] +tToT*par[5])))); + AliDebug(2,Form(" The Time slewing + delay (ns): %f: ",timeCorr)); + // add global time shift + //convert to ps + timeCorr*=1E3; + Double_t timeMis = (Double_t)(dig->GetTdc())*(Double_t)AliTOFGeometry::TdcBinWidth(); + timeMis = timeMis+timeCorr; + AliDebug(2,Form(" The Miscalibrated time (ps): %e: ",timeMis)); + + // now update the digit info + + Int_t tdcCorr= (Int_t)(timeMis/AliTOFGeometry::TdcBinWidth()); + AliDebug(2,Form(" Final Time (counts): %i: ",tdcCorr)); + // Setting Decalibrated Time signal (TDC counts) + dig->SetTdc(tdcCorr); + // Setting realistic ToT signal (TDC counts) + 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())); + if(tdcCorr<0){ + AliWarning (Form(" The bad Slewed Time(TDC counts)= %i ", tdcCorr)); + AliWarning(Form(" The bad ToT (TDC counts)= %i ", tot)); + } } - Int_t index = calib->GetIndex(detId); - AliTOFChannel *calChannel = cal->GetChannel(index); - // time slewing parameters - Float_t par[6]; - for (Int_t j = 0; j<6; j++){ - par[j]=calChannel->GetSlewPar(j); - if(par[j]!=0)dbEntry=kTRUE; + else{ + // For Data with no Miscalibration, set ToT signal == Adc + dig->SetToT((Int_t)(dig->GetAdc()/AliTOFGeometry::ToTBinWidth())); //remove the factor 10^3 just to have a reasonable ToT range for raw data simulation even in the case of non-realistic ToT distribution (n.b. fAdc is practically an arbitrary quantity, and ToT has no impact on the TOF reco for non-miscalibrated digits) } - // the global time shift - Float_t timedelay = calChannel->GetDelay(); - Float_t tToT= dig->GetToT()*AliTOFGeometry::ToTBinWidth()/1.E3; // to apply slewing need to go back to ns.. - dig->SetTdcND(dig->GetTdc()); - Float_t tdc = ((dig->GetTdc())*AliTOFGeometry::TdcBinWidth()+32)*1.E-3; //tof signal in ns - AliDebug(2,Form(" Time before miscalibration %f: ",tdc)); - // add slewing effect - Float_t timeoffset=par[0] + tToT*(par[1] +tToT*(par[2] +tToT*(par[3] +tToT*(par[4] +tToT*par[5])))); - Float_t timeSlewed = tdc+timeoffset; - AliDebug(2,Form(" Time before after offset %f: ",timeSlewed)); - // add global time shift - timeSlewed = timeSlewed + timedelay; - AliDebug(2,Form(" Time before after slewing %f: ",timeSlewed)); - - // Setting Decalibrated Time signal - dig->SetTdc((timeSlewed*1E3-32)/AliTOFGeometry::TdcBinWidth()); } - if(hToT->GetEntries()<=0 || !dbEntry){ + if(!isToTSimulated){ AliDebug(1,"Standard Production, no miscalibrated digits"); }else{ - AliDebug(1,"Miscalibrated digits"); + if(!misCalibPars){ + AliDebug(1,"Standard Production, no miscalibrated digits"); + } + else { + AliDebug(1,"Simulating miscalibrated digits"); + } } - return; }