#include "AliRunLoader.h"
#include "AliLoader.h"
#include "AliConfig.h"
-#include "AliRunDigitizer.h"
+#include "AliDigitizationInput.h"
#include "AliRunLoader.h"
#include "AliLoader.h"
#include "AliLog.h"
#include "AliTRDCommonParam.h"
#include "AliTRDfeeParam.h"
#include "AliTRDmcmSim.h"
+#include "AliTRDdigitsParam.h"
+
#include "Cal/AliTRDCalROC.h"
#include "Cal/AliTRDCalDet.h"
+#include "Cal/AliTRDCalOnlineGainTableROC.h"
ClassImp(AliTRDdigitizer)
,fSDigitsManagerList(0)
,fTRD(0)
,fGeo(0)
+ ,fMcmSim(new AliTRDmcmSim)
,fEvent(0)
,fMasks(0)
,fCompress(kTRUE)
// AliTRDdigitizer default constructor
//
- Init();
-
}
//_____________________________________________________________________________
,fSDigitsManagerList(0)
,fTRD(0)
,fGeo(0)
+ ,fMcmSim(new AliTRDmcmSim)
,fEvent(0)
,fMasks(0)
,fCompress(kTRUE)
// AliTRDdigitizer constructor
//
- Init();
-
}
//_____________________________________________________________________________
-AliTRDdigitizer::AliTRDdigitizer(AliRunDigitizer *manager
+AliTRDdigitizer::AliTRDdigitizer(AliDigitizationInput* digInput
, const Text_t *name, const Text_t *title)
- :AliDigitizer(manager,name,title)
+ :AliDigitizer(digInput,name,title)
,fRunLoader(0)
,fDigitsManager(0)
,fSDigitsManager(0)
,fSDigitsManagerList(0)
,fTRD(0)
,fGeo(0)
+ ,fMcmSim(new AliTRDmcmSim)
,fEvent(0)
,fMasks(0)
,fCompress(kTRUE)
// AliTRDdigitizer constructor
//
- Init();
-
}
//_____________________________________________________________________________
-AliTRDdigitizer::AliTRDdigitizer(AliRunDigitizer *manager)
- :AliDigitizer(manager,"AliTRDdigitizer","TRD digitizer")
+AliTRDdigitizer::AliTRDdigitizer(AliDigitizationInput* digInput)
+ :AliDigitizer(digInput,"AliTRDdigitizer","TRD digitizer")
,fRunLoader(0)
,fDigitsManager(0)
,fSDigitsManager(0)
,fSDigitsManagerList(0)
,fTRD(0)
,fGeo(0)
+ ,fMcmSim(new AliTRDmcmSim)
,fEvent(0)
,fMasks(0)
,fCompress(kTRUE)
// AliTRDdigitizer constructor
//
- Init();
-
-}
-
-//_____________________________________________________________________________
-Bool_t AliTRDdigitizer::Init()
-{
- //
- // Initialize the digitizer with default values
- //
-
- fRunLoader = 0;
- fDigitsManager = 0;
- fSDigitsManager = 0;
- fSDigitsManagerList = 0;
- fTRD = 0;
- fGeo = 0;
-
- fEvent = 0;
- fMasks = 0;
- fCompress = kTRUE;
- fSDigits = kFALSE;
- fMergeSignalOnly = kFALSE;
-
- return AliDigitizer::Init();
-
}
//_____________________________________________________________________________
,fSDigitsManagerList(0)
,fTRD(0)
,fGeo(0)
+ ,fMcmSim(new AliTRDmcmSim)
,fEvent(0)
,fMasks(0)
,fCompress(d.fCompress)
fDigitsManager = 0;
}
- if (fDigitsManager) { //typo? fSDigitsManager?
- delete fSDigitsManager;
+ if (fSDigitsManager) {
+ // s-digitsmanager will be deleted via list
fSDigitsManager = 0;
}
fMasks = 0;
}
+ if (fMcmSim) {
+ delete fMcmSim;
+ fMcmSim = 0;
+ }
+
if (fGeo) {
delete fGeo;
fGeo = 0;
}
//_____________________________________________________________________________
-void AliTRDdigitizer::Exec(const Option_t * const option)
+void AliTRDdigitizer::Digitize(const Option_t* option)
{
//
// Executes the merging
AliDebug(1,"AliRun object found on file.");
}
else {
- inrl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(0));
+ inrl = AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(0));
inrl->LoadgAlice();
gAlice = inrl->GetAliRun();
if (!gAlice) {
- AliError("Could not find AliRun object.")
+ AliError("Could not find AliRun object.");
return;
}
}
- Int_t nInput = fManager->GetNinputs();
+ Int_t nInput = fDigInput->GetNinputs();
fMasks = new Int_t[nInput];
for (iInput = 0; iInput < nInput; iInput++) {
- fMasks[iInput] = fManager->GetMask(iInput);
+ fMasks[iInput] = fDigInput->GetMask(iInput);
}
//
// Initialization
//
- AliRunLoader *orl = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
+ AliRunLoader *orl = AliRunLoader::GetRunLoader(fDigInput->GetOutputFolderName());
if (InitDetector()) {
AliDebug(1,Form("Add input stream %d",iInput));
// Check if the input tree exists
- inrl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(iInput));
+ inrl = AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(iInput));
AliLoader *gime = inrl->GetLoader("TRDLoader");
TTree *treees = gime->TreeS();
sdigitsManager = new AliTRDdigitsManager();
sdigitsManager->SetSDigits(kTRUE);
- AliRunLoader *rl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(iInput));
+ AliRunLoader *rl = AliRunLoader::GetRunLoader(fDigInput->GetInputFolderName(iInput));
AliLoader *gimme = rl->GetLoader("TRDLoader");
if (!gimme->TreeS())
{
return kTRUE;
}
+
//_____________________________________________________________________________
Bool_t AliTRDdigitizer::MakeBranch(TTree *tree) const
{
Float_t **hits = new Float_t*[kNdet];
Int_t *nhit = new Int_t[kNdet];
+ memset(nhit,0,kNdet*sizeof(Int_t));
AliTRDarraySignal *signals = 0x0;
+
+ // Check the number of time bins from simParam against OCDB,
+ // if OCDB value is not supposed to be used.
+ // As default, the value from OCDB is taken
+ if (AliTRDSimParam::Instance()->GetNTBoverwriteOCDB()) {
+ if (calibration->GetNumberOfTimeBinsDCS() != AliTRDSimParam::Instance()->GetNTimeBins()) {
+ AliWarning(Form("Number of time bins is different to OCDB value [SIM=%d, OCDB=%d]"
+ ,AliTRDSimParam::Instance()->GetNTimeBins()
+ ,calibration->GetNumberOfTimeBinsDCS()));
+ }
+ // Save the values for the raw data headers
+ fDigitsManager->GetDigitsParam()->SetNTimeBinsAll(AliTRDSimParam::Instance()->GetNTimeBins());
+ }
+ else {
+ // Save the values for the raw data headers
+ fDigitsManager->GetDigitsParam()->SetNTimeBinsAll(calibration->GetNumberOfTimeBinsDCS());
+ }
+
+ // Save the values for the raw data headers
+ fDigitsManager->GetDigitsParam()->SetADCbaselineAll(AliTRDSimParam::Instance()->GetADCbaseline());
// Sort all hits according to detector number
if (!SortHits(hits,nhit)) {
AliError("Sorting hits failed");
+ delete [] hits;
+ delete [] nhit;
return kFALSE;
}
for (Int_t det = 0; det < kNdet; det++) {
// Detectors that are switched off, not installed, etc.
- if (( calibration->IsChamberInstalled(det)) &&
- (!calibration->IsChamberMasked(det)) &&
+ if ((!calibration->IsChamberNoData(det)) &&
( fGeo->ChamberInGeometry(det)) &&
(nhit[det] > 0)) {
// Convert the hits of the current detector to detector signals
if (!ConvertHits(det,hits[det],nhit[det],signals)) {
AliError(Form("Conversion of hits failed for detector=%d",det));
+ delete [] hits;
+ delete [] nhit;
+ delete signals;
+ signals = 0x0;
return kFALSE;
}
+
// Convert the detector signals to digits or s-digits
if (!ConvertSignals(det,signals)) {
AliError(Form("Conversion of signals failed for detector=%d",det));
+ delete [] hits;
+ delete [] nhit;
+ delete signals;
+ signals = 0x0;
return kFALSE;
}
} // for: detector
+ if (!fSDigits) {
+ if (AliDataLoader *trklLoader
+ = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets")) {
+ if (trklLoader->Tree())
+ trklLoader->WriteData("OVERWRITE");
+ }
+ }
+
delete [] hits;
delete [] nhit;
Int_t nhitTrk = 0;
Int_t *lhit = new Int_t[kNdet];
+ memset(lhit,0,kNdet*sizeof(Int_t));
for (Int_t det = 0; det < kNdet; det++) {
- lhit[det] = 0;
- nhit[det] = 0;
- hits[det] = 0;
+ hits[det] = 0x0;
}
AliLoader *gimme = fRunLoader->GetLoader("TRDLoader");
TTree *hitTree = gimme->TreeH();
if (hitTree == 0x0) {
AliError("Can not get TreeH");
+ delete [] lhit;
return kFALSE;
}
fTRD->SetTreeAddress();
AliTRDCalROC *calT0ROC = 0;
Float_t calT0DetValue = 0.0;
const AliTRDCalDet *calT0Det = calibration->GetT0Det();
+ Double_t calExBDetValue = 0.0;
+ const AliTRDCalDet *calExBDet = calibration->GetExBDet();
if (simParam->TRFOn()) {
timeBinTRFend = ((Int_t) (simParam->GetTRFhi()
* commonParam->GetSamplingFrequency())) - 1;
}
- Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
+ Int_t nTimeTotal = fDigitsManager->GetDigitsParam()->GetNTimeBins(det);
Float_t samplingRate = commonParam->GetSamplingFrequency();
Float_t elAttachProp = simParam->GetElAttachProp() / 100.0;
calVdriftDetValue = calVdriftDet->GetValue(det);
calT0ROC = calibration->GetT0ROC(det);
calT0DetValue = calT0Det->GetValue(det);
+ calExBDetValue = calExBDet->GetValue(det);
// Go to the local coordinate system:
// loc[0] - col direction in amplification or driftvolume
Float_t driftvelocity = calVdriftDetValue * calVdriftROC->GetValue(colE,rowE);
Double_t absdriftlength = TMath::Abs(driftlength);
if (commonParam->ExBOn()) {
- absdriftlength /= TMath::Sqrt(GetLorentzFactor(driftvelocity));
+ absdriftlength /= TMath::Sqrt(1.0 / (1.0 + calExBDetValue*calExBDetValue));
}
// Loop over all electrons of this hit
// Apply the diffusion smearing
if (simParam->DiffusionOn()) {
- if (!(Diffusion(driftvelocity,absdriftlength,locR,locC,locT))) {
+ if (!(Diffusion(driftvelocity,absdriftlength,calExBDetValue,locR,locC,locT))) {
continue;
}
}
// Apply E x B effects (depends on drift direction)
- if (commonParam->ExBOn()) {
- if (!(ExB(driftvelocity,driftlength,locC))) {
- continue;
- }
+ if (commonParam->ExBOn()) {
+ locC = locC + calExBDetValue * driftlength;
}
// The electron position after diffusion and ExB in pad coordinates.
Int_t nRowMax = fGeo->GetPadPlane(det)->GetNrows();
Int_t nColMax = fGeo->GetPadPlane(det)->GetNcols();
- Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
+ Int_t nTimeTotal = fDigitsManager->GetDigitsParam()->GetNTimeBins(det);
+ if (fSDigitsManager->GetDigitsParam()->GetNTimeBins(det)) {
+ nTimeTotal = fSDigitsManager->GetDigitsParam()->GetNTimeBins(det);
+ }
+ else {
+ AliFatal("Could not get number of time bins");
+ return kFALSE;
+ }
- // The gainfactor calibration objects
+ // The gain factor calibration objects
const AliTRDCalDet *calGainFactorDet = calibration->GetGainFactorDet();
- AliTRDCalROC *calGainFactorROC = 0;
+ AliTRDCalROC *calGainFactorROC = 0x0;
Float_t calGainFactorDetValue = 0.0;
AliTRDarrayADC *digits = 0x0;
calGainFactorROC = calibration->GetGainFactorROC(det);
calGainFactorDetValue = calGainFactorDet->GetValue(det);
+ // Get the online gain factors
+ //AliTRDCalOnlineGainTableROC *onlineGainFactorROC
+ // = calibration->GetOnlineGainTableROC(det);
+
// Create the digits for this chamber
for (row = 0; row < nRowMax; row++ ) {
for (col = 0; col < nColMax; col++ ) {
// Check whether pad is masked
// Bridged pads are not considered yet!!!
- if (calibration->IsPadMasked(det,col,row)) {
+ if (calibration->IsPadMasked(det,col,row) ||
+ calibration->IsPadNotConnected(det,col,row)) {
continue;
}
Int_t nRowMax = fGeo->GetPadPlane(det)->GetNrows();
Int_t nColMax = fGeo->GetPadPlane(det)->GetNcols();
- Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
+ Int_t nTimeTotal = fDigitsManager->GetDigitsParam()->GetNTimeBins(det);
// Get the container for the digits of this detector
-
if (!fDigitsManager->HasSDigits()) {
AliError("Digits manager has no s-digits");
return kFALSE;
Int_t nRowMax = fGeo->GetPadPlane(det)->GetNrows();
Int_t nColMax = fGeo->GetPadPlane(det)->GetNcols();
- Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
+ Int_t nTimeTotal = manDig->GetDigitsParam()->GetNTimeBins(det);
// Get the calibration objects
//calGainFactorROC = calibration->GetGainFactorROC(det);
tracks1->Allocate(nRowMax,nColMax,nTimeTotal);
tracks2->Allocate(nRowMax,nColMax,nTimeTotal);
- if (!digits->HasData()) {
- continue;
- }
-
- // Create the sdigits for this chamber
- for (row = 0; row < nRowMax; row++ ) {
- for (col = 0; col < nColMax; col++ ) {
+ // Keep the digits param
+ manSDig->GetDigitsParam()->SetNTimeBinsAll(manDig->GetDigitsParam()->GetNTimeBins(0));
+ manSDig->GetDigitsParam()->SetADCbaselineAll(manDig->GetDigitsParam()->GetADCbaseline(0));
- // The gain factors
- //Float_t padgain = calGainFactorDetValue
- // * calGainFactorROC->GetValue(col,row);
-
- for (time = 0; time < nTimeTotal; time++) {
+ if (digits->HasData()) {
- Double_t signal = (Double_t) digits->GetData(row,col,time);
+ digits->Expand();
- // ADC -> signal in mV
- signal /= adcConvert;
+ // Create the sdigits for this chamber
+ for (row = 0; row < nRowMax; row++ ) {
+ for (col = 0; col < nColMax; col++ ) {
- // Subtract baseline in mV
- signal -= baseline;
+ // The gain factors
+ //Float_t padgain = calGainFactorDetValue
+ // * calGainFactorROC->GetValue(col,row);
- // Signal in mV -> signal in #electrons
- signal /= convert;
+ for (time = 0; time < nTimeTotal; time++) {
- // Gain factor
- //signal /= padgain; // Not needed for real data
+ Short_t adcVal = digits->GetData(row,col,time);
+ Double_t signal = (Double_t) adcVal;
+ // ADC -> signal in mV
+ signal /= adcConvert;
+ // Subtract baseline in mV
+ signal -= baseline;
+ // Signal in mV -> signal in #electrons
+ signal /= convert;
+ // Gain factor
+ //signal /= padgain; // Not needed for real data
+ // Pad and time coupling
+ signal /= coupling;
- // Pad and time coupling
- signal /= coupling;
+ sdigits->SetData(row,col,time,signal);
+ tracks0->SetData(row,col,time,0);
+ tracks1->SetData(row,col,time,0);
+ tracks2->SetData(row,col,time,0);
- sdigits->SetData(row,col,time,signal);
- tracks0->SetData(row,col,time,0);
- tracks1->SetData(row,col,time,0);
- tracks2->SetData(row,col,time,0);
+ } // for: time
- } // for: time
-
- } // for: col
- } // for: row
+ } // for: col
+ } // for: row
+ } // if: has data
+
sdigits->Compress(0);
tracks0->Compress();
tracks1->Compress();
tracks2->Compress();
+ // No compress just remove
+ manDig->RemoveDigits(det);
+ manDig->RemoveDictionaries(det);
+
} // for: det
return kTRUE;
AliDebug(1,"Only one input file.");
}
- Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
Int_t iMerge = 0;
while (mergeSDigitsManager) {
iMerge++;
-
+
// Loop through the detectors
for (Int_t iDet = 0; iDet < AliTRDgeometry::Ndet(); iDet++) {
+ Int_t nTimeTotal = fSDigitsManager->GetDigitsParam()->GetNTimeBins(iDet);
+ if (mergeSDigitsManager->GetDigitsParam()->GetNTimeBins(iDet) != nTimeTotal) {
+ AliError(Form("Mismatch in the number of time bins [%d,%d] in detector %d"
+ ,nTimeTotal
+ ,mergeSDigitsManager->GetDigitsParam()->GetNTimeBins(iDet)
+ ,iDet));
+ return kFALSE;
+ }
+
Int_t nRowMax = fGeo->GetPadPlane(iDet)->GetNrows();
Int_t nColMax = fGeo->GetPadPlane(iDet)->GetNcols();
} // for: detector numbers
+ if (AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets")) {
+ if (trklLoader->Tree())
+ trklLoader->WriteData("OVERWRITE");
+ }
+
+ // Save the values for the raw data headers
+ if (AliTRDSimParam::Instance()->GetNTBoverwriteOCDB()) {
+ fDigitsManager->GetDigitsParam()->SetNTimeBinsAll(AliTRDSimParam::Instance()->GetNTimeBins());
+ }
+ else {
+ fDigitsManager->GetDigitsParam()->SetNTimeBinsAll(AliTRDcalibDB::Instance()->GetNumberOfTimeBinsDCS());
+ }
+ fDigitsManager->GetDigitsParam()->SetADCbaselineAll(AliTRDSimParam::Instance()->GetADCbaseline());
return kTRUE;
Int_t nRowMax = fGeo->GetPadPlane(det)->GetNrows();
Int_t nColMax = fGeo->GetPadPlane(det)->GetNcols();
- Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
+ Int_t nTimeTotal = fSDigitsManager->GetDigitsParam()->GetNTimeBins(det);
Int_t row = 0;
Int_t col = 0;
//_____________________________________________________________________________
Int_t AliTRDdigitizer::Diffusion(Float_t vdrift, Double_t absdriftlength
+ , Double_t exbvalue
, Double_t &lRow, Double_t &lCol, Double_t &lTime)
{
//
Float_t sigmaT = driftSqrt * diffT;
Float_t sigmaL = driftSqrt * diffL;
lRow = gRandom->Gaus(lRow ,sigmaT);
- lCol = gRandom->Gaus(lCol ,sigmaT * GetLorentzFactor(vdrift));
- lTime = gRandom->Gaus(lTime,sigmaL * GetLorentzFactor(vdrift));
+ if (AliTRDCommonParam::Instance()->ExBOn()) {
+ lCol = gRandom->Gaus(lCol ,sigmaT * 1.0 / (1.0 + exbvalue*exbvalue));
+ lTime = gRandom->Gaus(lTime,sigmaL * 1.0 / (1.0 + exbvalue*exbvalue));
+ }
+ else {
+ lCol = gRandom->Gaus(lCol ,sigmaT);
+ lTime = gRandom->Gaus(lTime,sigmaL);
+ }
return 1;
}
}
-
-//_____________________________________________________________________________
-Float_t AliTRDdigitizer::GetLorentzFactor(Float_t vd)
-{
- //
- // Returns the Lorentz factor
- //
-
- Double_t omegaTau = AliTRDCommonParam::Instance()->GetOmegaTau(vd);
- Double_t lorentzFactor = 1.0;
- if (AliTRDCommonParam::Instance()->ExBOn()) {
- lorentzFactor = 1.0 / (1.0 + omegaTau*omegaTau);
- }
-
- return lorentzFactor;
-
-}
-//_____________________________________________________________________________
-Int_t AliTRDdigitizer::ExB(Float_t vdrift, Double_t driftlength, Double_t &lCol)
-{
- //
- // Applies E x B effects to the position of a single electron.
- // Depends on signed drift length.
- //
-
- lCol = lCol
- + AliTRDCommonParam::Instance()->GetOmegaTau(vdrift)
- * driftlength;
-
- return 1;
-
-}
-
//_____________________________________________________________________________
void AliTRDdigitizer::RunDigitalProcessing(Int_t det)
{
AliTRDfeeParam *feeParam = AliTRDfeeParam::Instance();
- //Create and initialize the mcm object
- AliTRDmcmSim* mcmfast = new AliTRDmcmSim();
-
AliTRDarrayADC *digits = fDigitsManager->GetDigits(det);
if (!digits)
return;
{
for(Int_t mcm = 0; mcm < 16; mcm++)
{
- mcmfast->Init(det, rob, mcm);
- mcmfast->SetData(digits, fDigitsManager);
- mcmfast->Filter();
+ fMcmSim->Init(det, rob, mcm);
+ fMcmSim->SetDataByPad(digits, fDigitsManager);
+ fMcmSim->Filter();
if (feeParam->GetTracklet()) {
- mcmfast->Tracklet();
- mcmfast->StoreTracklets();
+ fMcmSim->Tracklet();
+ fMcmSim->StoreTracklets();
}
- mcmfast->ZSMapping();
- mcmfast->WriteData(digits);
+ fMcmSim->ZSMapping();
+ fMcmSim->WriteData(digits);
}
}
- delete mcmfast;
-
}
+
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff