#include "TH1F.h"
#include "TTree.h"
#include "TRandom.h"
+#include "TObjArray.h"
#include "AliLoader.h"
#include "AliLog.h"
#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"
//___________________________________________
AliTOFDigitizer::AliTOFDigitizer() :
AliDigitizer(),
- fGeom(0x0),
fDigits(0x0),
fSDigitsArray(0x0),
fhitMap(0x0)
//___________________________________________
AliTOFDigitizer::AliTOFDigitizer(AliRunDigitizer* manager):
AliDigitizer(manager),
- fGeom(0x0),
fDigits(0x0),
fSDigitsArray(0x0),
fhitMap(0x0)
//------------------------------------------------------------------------
AliTOFDigitizer::AliTOFDigitizer(const AliTOFDigitizer &source):
AliDigitizer(source),
- fGeom(0x0),
fDigits(0),
fSDigitsArray(0),
fhitMap(0)
this->fDigits=source.fDigits;
this->fSDigitsArray=source.fSDigitsArray;
this->fhitMap=source.fhitMap;
- this->fGeom=source.fGeom;
}
this->fDigits=source.fDigits;
this->fSDigitsArray=source.fSDigitsArray;
this->fhitMap=source.fhitMap;
- this->fGeom=source.fGeom;
return *this;
}
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)
{
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
} // end loop on sdigits - end digitizing all collected sdigits
//Insert Decalibration
-
- AliTOFcalib * calib = new AliTOFcalib(fGeom);
+ AliInfo("in digitizer, create digits");
+ AliTOFcalib * calib = new AliTOFcalib();
InitDecalibration(calib);
DecalibrateTOFSignal(calib);
delete calib;
//_____________________________________________________________________________
void AliTOFDigitizer::InitDecalibration( AliTOFcalib *calib) const {
- calib->ReadSimParFromCDB("TOF/Calib", -1); // use AliCDBManager's number
+ calib->CreateSimCalArrays();
+ calib->ReadSimParOnlineFromCDB("TOF/Calib", -1); // use AliCDBManager's number
+ calib->ReadSimParOfflineFromCDB("TOF/Calib", -1); // use AliCDBManager's number
}
//---------------------------------------------------------------------
void AliTOFDigitizer::DecalibrateTOFSignal( AliTOFcalib *calib){
// Read Calibration parameters from the CDB
- AliTOFCal * cal= calib->GetTOFCalSimArray();
+ TObjArray * calOnline= calib->GetTOFSimCalArrayOnline();
+ TObjArray * calOffline= calib->GetTOFSimCalArrayOffline();
- AliDebug(2,Form("Size of AliTOFCal = %i",cal->NPads()));
+ AliDebug(2,Form("Size of array for Online Calibration = %i",calOnline->GetEntries()));
+ AliDebug(2,Form("Size of array for Offline Calibration = %i",calOffline->GetEntries()));
// Initialize Quantities to Simulate ToT Spectra
Bool_t isToTSimulated=kFALSE;
Bool_t misCalibPars=kFALSE;
if(hToT->GetEntries()>0)isToTSimulated=kTRUE;
- Int_t ndigits = fDigits->GetEntriesFast();
+ Int_t ndigits = fDigits->GetEntriesFast();
for (Int_t i=0;i<ndigits;i++){
AliTOFdigit * dig = (AliTOFdigit*)fDigits->At(i);
Int_t detId[5];
//A realistic ToT Spectrum was found in input,
//decalibrated TOF Digits likely to be simulated....
- Int_t index = calib->GetIndex(detId); // The channel index
- AliTOFChannel *calChannel = cal->GetChannel(index); //retrieve the info
- Float_t timedelay = calChannel->GetDelay(); //The global channel delay
- Float_t par[6]; // time slewing parameters
+ Int_t index = AliTOFGeometry::GetIndex(detId); // The channel index
+ AliTOFChannelOnline *calChannelOnline = (AliTOFChannelOnline *)calOnline->At(index); //retrieve the info for time delay
+ AliTOFChannelOffline *calChannelOffline = (AliTOFChannelOffline *)calOffline->At(index); //retrieve the info for time slewing
+ Double_t timedelay = (Double_t)calChannelOnline->GetDelay(); //The global channel delay, ns
+ Double_t par[6]; // time slewing parameters
//check whether we actually ask for miscalibration
if(timedelay!=0)misCalibPars=kTRUE;
for (Int_t j = 0; j<6; j++){
- par[j]=calChannel->GetSlewPar(j);
+ par[j]=(Double_t)calChannelOffline->GetSlewPar(j);
if(par[j]!=0)misCalibPars=kTRUE;
}
AliDebug(2,Form(" Calib Pars = %f, %f, %f, %f, %f, %f ",par[0],par[1],par[2],par[3],par[4],par[5]));
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()*AliTOFGeometry::TdcBinWidth()));
+ 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 (ns): %f: ",timeCorr));
+ AliDebug(2,Form(" The Time delay (ns): %f: ",timedelay));
// add global time shift
timeCorr = timeCorr + timedelay;
- AliDebug(2,Form(" The Time Slewing+ delay (ns): %f: ",timeCorr));
+ AliDebug(2,Form(" The Time Slewing + delay (ns): %f: ",timeCorr));
//convert to ps
timeCorr*=1E3;
- Double_t timeMis = (Double_t)(dig->GetTdc())*AliTOFGeometry::TdcBinWidth();
+ Double_t timeMis = (Double_t)(dig->GetTdc())*(Double_t)AliTOFGeometry::TdcBinWidth();
timeMis = timeMis+timeCorr;
AliDebug(2,Form(" The Miscalibrated time (ps): %e: ",timeMis));
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: ",dig->GetTdc(),dig->GetToT()));
+ 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));
#include "AliCDBMetaData.h"
#include "AliLog.h"
-#include "AliTOFCalOnline.h"
#include "AliTOFChannelOnline.h"
#include "AliTOFDataDCS.h"
-#include "AliTOFGeometryV5.h"
+#include "AliTOFGeometry.h"
#include "AliTOFPreprocessor.h"
class TF1;
fData(0),
fh2(0),
fCal(0),
- fTOFGeometry(0),
+ fNChannels(0),
fStoreRefData(kTRUE)
{
// constructor
+
}
//_____________________________________________________________________________
fData = 0;
delete fh2;
fh2 = 0;
+ fCal->Clear();
delete fCal;
fCal = 0;
- delete fTOFGeometry;
- fTOFGeometry = 0;
}
//______________________________________________________________________________
fData = new AliTOFDataDCS(fRun, fStartTime, fEndTime);
fh2 = 0x0;
- fTOFGeometry = new AliTOFGeometryV5();
- fCal = new AliTOFCalOnline(fTOFGeometry);
- fCal->CreateArray();
+ fNChannels = AliTOFGeometry::NSectors()*(2*(AliTOFGeometry::NStripC()+AliTOFGeometry::NStripB())+AliTOFGeometry::NStripA())*AliTOFGeometry::NpadZ()*AliTOFGeometry::NpadX();
+ fCal = new TObjArray(fNChannels);
+ fCal->SetOwner();
+ for (Int_t ich = 0; ich<fNChannels; ich ++){
+ AliTOFChannelOnline * calChOnline = new AliTOFChannelOnline();
+ fCal->AddAt(calChOnline,ich);
+ }
}
//_____________________________________________________________________________
static const Int_t kSize=fh2->GetNbinsX();
static const Int_t kNBins=fh2->GetNbinsY();
static const Double_t kXBinmin=fh2->GetYaxis()->GetBinLowEdge(1);
- Int_t npads = fCal->NPads();
- if (kSize != npads){
+ if (kSize != fNChannels){
Log(" number of bins along x different from number of pads, found only a subset of the histograms, TOF exiting from Shuttle");
delete daqFile;
return 7; //return error code for histograms not existing/junky
sumw2=sumw2/nent; //<x^2>
Double_t rmsmean= 0;
rmsmean = TMath::Sqrt((sumw2-mean*mean)/nent);
- if (ich<npads) {
- AliTOFChannelOnline * ch = fCal->GetChannel(ich);
- ch->SetDelay(mean);
+ if (ich<fNChannels) {
+ AliTOFChannelOnline * ch = (AliTOFChannelOnline *)fCal->At(ich);
+ ch->SetDelay((Double_t)mean*AliTOFGeometry::TdcBinWidth()*1.E-3); // delay in ns
}
delete h1;
h1=0x0;