//_____________________________________________________________________________
AliTRDdigitizer::AliTRDdigitizer()
+ :AliDigitizer()
+ ,fRunLoader(0)
+ ,fDigitsManager(0)
+ ,fSDigitsManager(0)
+ ,fSDigitsManagerList(0)
+ ,fTRD(0)
+ ,fGeo(0)
+ ,fEvent(0)
+ ,fMasks(0)
+ ,fCompress(kTRUE)
+ ,fSDigits(kFALSE)
+ ,fSDigitsScale(0.0)
+ ,fMergeSignalOnly(kFALSE)
+ ,fDiffLastVdrift(0)
+ ,fDiffusionT(0.0)
+ ,fDiffusionL(0.0)
+ ,fOmegaTau(0.0)
+ ,fLorentzFactor(0.0)
+ ,fTimeLastVdrift(0)
+ ,fTimeStruct1(0)
+ ,fTimeStruct2(0)
+ ,fVDlo(0)
+ ,fVDhi(0)
{
//
// AliTRDdigitizer default constructor
//
-
- fRunLoader = 0;
- fDigitsManager = 0;
- fSDigitsManager = 0;
- fSDigitsManagerList = 0;
- fTRD = 0;
- fGeo = 0;
- fEvent = 0;
- fMasks = 0;
- fCompress = kTRUE;
- fSDigits = kFALSE;
- fSDigitsScale = 0.0;
- fMergeSignalOnly = kFALSE;
-
- fTimeStructInfo.fLastVdrift = 0;
- fTimeStructInfo.fTimeStruct1 = 0;
- fTimeStructInfo.fTimeStruct2 = 0;
- fTimeStructInfo.fVDlo = 0;
- fTimeStructInfo.fVDhi = 0;
-
- fDiffusionInfo.fLastVdrift = 0;
- fDiffusionInfo.fDiffusionT = 0.0;
- fDiffusionInfo.fDiffusionL = 0.0;
- fDiffusionInfo.fLorentzFactor = 0.0;
Init();
}
//_____________________________________________________________________________
-AliTRDdigitizer::AliTRDdigitizer(const Text_t *name, const Text_t *title)
- :AliDigitizer(name,title)
+AliTRDdigitizer::AliTRDdigitizer(const Text_t *name, const Text_t *title)
+ :AliDigitizer(name,title)
+ ,fRunLoader(0)
+ ,fDigitsManager(0)
+ ,fSDigitsManager(0)
+ ,fSDigitsManagerList(0)
+ ,fTRD(0)
+ ,fGeo(0)
+ ,fEvent(0)
+ ,fMasks(0)
+ ,fCompress(kTRUE)
+ ,fSDigits(kFALSE)
+ ,fSDigitsScale(0.0)
+ ,fMergeSignalOnly(kFALSE)
+ ,fDiffLastVdrift(0)
+ ,fDiffusionT(0.0)
+ ,fDiffusionL(0.0)
+ ,fOmegaTau(0.0)
+ ,fLorentzFactor(0.0)
+ ,fTimeLastVdrift(0)
+ ,fTimeStruct1(0)
+ ,fTimeStruct2(0)
+ ,fVDlo(0)
+ ,fVDhi(0)
{
//
// AliTRDdigitizer constructor
//_____________________________________________________________________________
AliTRDdigitizer::AliTRDdigitizer(AliRunDigitizer *manager
- , const Text_t *name, const Text_t *title)
- :AliDigitizer(manager,name,title)
+ , const Text_t *name, const Text_t *title)
+ :AliDigitizer(manager,name,title)
+ ,fRunLoader(0)
+ ,fDigitsManager(0)
+ ,fSDigitsManager(0)
+ ,fSDigitsManagerList(0)
+ ,fTRD(0)
+ ,fGeo(0)
+ ,fEvent(0)
+ ,fMasks(0)
+ ,fCompress(kTRUE)
+ ,fSDigits(kFALSE)
+ ,fSDigitsScale(0.0)
+ ,fMergeSignalOnly(kFALSE)
+ ,fDiffLastVdrift(0)
+ ,fDiffusionT(0.0)
+ ,fDiffusionL(0.0)
+ ,fOmegaTau(0.0)
+ ,fLorentzFactor(0.0)
+ ,fTimeLastVdrift(0)
+ ,fTimeStruct1(0)
+ ,fTimeStruct2(0)
+ ,fVDlo(0)
+ ,fVDhi(0)
{
//
// AliTRDdigitizer constructor
//_____________________________________________________________________________
AliTRDdigitizer::AliTRDdigitizer(AliRunDigitizer *manager)
- :AliDigitizer(manager,"AliTRDdigitizer","TRD digitizer")
+ :AliDigitizer(manager,"AliTRDdigitizer","TRD digitizer")
+ ,fRunLoader(0)
+ ,fDigitsManager(0)
+ ,fSDigitsManager(0)
+ ,fSDigitsManagerList(0)
+ ,fTRD(0)
+ ,fGeo(0)
+ ,fEvent(0)
+ ,fMasks(0)
+ ,fCompress(kTRUE)
+ ,fSDigits(kFALSE)
+ ,fSDigitsScale(0.0)
+ ,fMergeSignalOnly(kFALSE)
+ ,fDiffLastVdrift(0)
+ ,fDiffusionT(0.0)
+ ,fDiffusionL(0.0)
+ ,fOmegaTau(0.0)
+ ,fLorentzFactor(0.0)
+ ,fTimeLastVdrift(0)
+ ,fTimeStruct1(0)
+ ,fTimeStruct2(0)
+ ,fVDlo(0)
+ ,fVDhi(0)
{
//
// AliTRDdigitizer constructor
//
fRunLoader = 0;
-
- //NewIO: These data members probably are not needed anymore
fDigitsManager = 0;
fSDigitsManager = 0;
fSDigitsManagerList = 0;
fTRD = 0;
fGeo = 0;
- //End NewIO comment
fEvent = 0;
fMasks = 0;
fCompress = kTRUE;
fSDigits = kFALSE;
- fSDigitsScale = 100.; // For the summable digits
+ fSDigitsScale = 100.0;
fMergeSignalOnly = kFALSE;
- fTimeStructInfo.fLastVdrift = -1;
- fTimeStructInfo.fTimeStruct1 = 0;
- fTimeStructInfo.fTimeStruct2 = 0;
- fTimeStructInfo.fVDlo = 0;
- fTimeStructInfo.fVDhi = 0;
+ fTimeLastVdrift = -1;
+ fTimeStruct1 = 0;
+ fTimeStruct2 = 0;
+ fVDlo = 0;
+ fVDhi = 0;
- fDiffusionInfo.fLastVdrift = -1;
- fDiffusionInfo.fDiffusionT = 0.0;
- fDiffusionInfo.fDiffusionL = 0.0;
- fDiffusionInfo.fLorentzFactor = 0.0;
+ fDiffLastVdrift = -1;
+ fDiffusionT = 0.0;
+ fDiffusionL = 0.0;
+ fLorentzFactor = 0.0;
return AliDigitizer::Init();
}
//_____________________________________________________________________________
-AliTRDdigitizer::AliTRDdigitizer(const AliTRDdigitizer &d):AliDigitizer(d)
+AliTRDdigitizer::AliTRDdigitizer(const AliTRDdigitizer &d)
+ :AliDigitizer(d)
+ ,fRunLoader(0)
+ ,fDigitsManager(0)
+ ,fSDigitsManager(0)
+ ,fSDigitsManagerList(0)
+ ,fTRD(0)
+ ,fGeo(0)
+ ,fEvent(0)
+ ,fMasks(0)
+ ,fCompress(d.fCompress)
+ ,fSDigits(d.fSDigits)
+ ,fSDigitsScale(d.fSDigitsScale)
+ ,fMergeSignalOnly(d.fMergeSignalOnly)
+ ,fDiffLastVdrift(-1)
+ ,fDiffusionT(0.0)
+ ,fDiffusionL(0.0)
+ ,fOmegaTau(0.0)
+ ,fLorentzFactor(0.0)
+ ,fTimeLastVdrift(-1)
+ ,fTimeStruct1(0)
+ ,fTimeStruct2(0)
+ ,fVDlo(0)
+ ,fVDhi(0)
{
//
// AliTRDdigitizer copy constructor
//
- ((AliTRDdigitizer &) d).Copy(*this);
+ // Do not copy timestructs, just invalidate lastvdrift.
+ // Next time they are requested, they get recalculated
+ if (((AliTRDdigitizer &) d).fTimeStruct1) {
+ delete [] ((AliTRDdigitizer &) d).fTimeStruct1;
+ ((AliTRDdigitizer &) d).fTimeStruct1 = 0;
+ }
+ if (((AliTRDdigitizer &) d).fTimeStruct2) {
+ delete [] ((AliTRDdigitizer &) d).fTimeStruct2;
+ ((AliTRDdigitizer &) d).fTimeStruct2 = 0;
+ }
}
if (fDigitsManager) {
delete fDigitsManager;
- fDigitsManager = 0;
+ fDigitsManager = 0;
}
- fSDigitsManager = 0;
+ if (fDigitsManager) {
+ delete fSDigitsManager;
+ fSDigitsManager = 0;
+ }
if (fSDigitsManagerList) {
fSDigitsManagerList->Delete();
fMasks = 0;
}
- if (fTimeStructInfo.fTimeStruct1)
- {
- delete [] fTimeStructInfo.fTimeStruct1;
- fTimeStructInfo.fTimeStruct1 = 0;
+ if (fTimeStruct1) {
+ delete [] fTimeStruct1;
+ fTimeStruct1 = 0;
}
- if (fTimeStructInfo.fTimeStruct2)
- {
- delete [] fTimeStructInfo.fTimeStruct2;
- fTimeStructInfo.fTimeStruct2 = 0;
+ if (fTimeStruct2) {
+ delete [] fTimeStruct2;
+ fTimeStruct2 = 0;
}
}
//
if (this != &d) ((AliTRDdigitizer &) d).Copy(*this);
+
return *this;
}
AliTRDdigitizer& target = (AliTRDdigitizer &) d;
- target.fDiffusionInfo = fDiffusionInfo;
-
// Do not copy timestructs, just invalidate lastvdrift.
// Next time they are requested, they get recalculated
- if (target.fTimeStructInfo.fTimeStruct1)
- {
- delete[] target.fTimeStructInfo.fTimeStruct1;
- target.fTimeStructInfo.fTimeStruct1 = 0;
- }
- if (target.fTimeStructInfo.fTimeStruct2)
- {
- delete[] target.fTimeStructInfo.fTimeStruct2;
- target.fTimeStructInfo.fTimeStruct2 = 0;
+ if (target.fTimeStruct1) {
+ delete [] target.fTimeStruct1;
+ target.fTimeStruct1 = 0;
+ }
+ if (target.fTimeStruct2) {
+ delete [] target.fTimeStruct2;
+ target.fTimeStruct2 = 0;
}
- target.fTimeStructInfo.fLastVdrift = -1;
+ target.fTimeLastVdrift = -1;
}
//_____________________________________________________________________________
-void AliTRDdigitizer::Exec(Option_t* option)
+void AliTRDdigitizer::Exec(Option_t *option)
{
//
// Executes the merging
}
// The AliRoot file is already connected by the manager
- AliRunLoader* inrl;
+ AliRunLoader *inrl;
if (gAlice) {
AliDebug(1,"AliRun object found on file.\n");
}
Int_t nInput = fManager->GetNinputs();
- fMasks = new Int_t[nInput];
+ fMasks = new Int_t[nInput];
for (iInput = 0; iInput < nInput; iInput++) {
fMasks[iInput] = fManager->GetMask(iInput);
}
// Initialization
//
- AliRunLoader* orl = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
+ AliRunLoader *orl = AliRunLoader::GetRunLoader(fManager->GetOutputFolderName());
+
if (InitDetector()) {
- AliLoader* ogime = orl->GetLoader("TRDLoader");
+ AliLoader *ogime = orl->GetLoader("TRDLoader");
- TTree* tree = 0;
+ TTree *tree = 0;
if (fSDigits) {
// If we produce SDigits
tree = ogime->TreeS();
// Check if the input tree exists
inrl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(iInput));
- AliLoader* gime = inrl->GetLoader("TRDLoader");
+ AliLoader *gime = inrl->GetLoader("TRDLoader");
- TTree * treees = gime->TreeS();
+ TTree *treees = gime->TreeS();
if (treees == 0x0) {
if (gime->LoadSDigits()) {
AliError(Form("Error Occured while loading S. Digits for input %d.",iInput));
return;
}
- treees = gime->TreeS();
+ treees = gime->TreeS();
}
if (treees == 0x0) {
sdigitsManager = new AliTRDdigitsManager();
sdigitsManager->SetSDigits(kTRUE);
- AliRunLoader* rl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(iInput));
- AliLoader* gimme = rl->GetLoader("TRDLoader");
- if (!gimme->TreeS()) gimme->LoadSDigits();
+ AliRunLoader *rl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(iInput));
+ AliLoader *gimme = rl->GetLoader("TRDLoader");
+ if (!gimme->TreeS()) {
+ gimme->LoadSDigits();
+ }
sdigitsManager->ReadDigits(gimme->TreeS());
// Add the s-digits to the input list
if (!fRunLoader) {
fRunLoader = AliRunLoader::Open(file,evfoldname,"UPDATE");
}
-
if (!fRunLoader) {
- AliError(Form("Can not open session for file %s.",file));
- return kFALSE;
- }
+ AliError(Form("Can not open session for file %s.",file));
+ return kFALSE;
+ }
if (!fRunLoader->GetAliRun()) {
fRunLoader->LoadgAlice();
fEvent = nEvent;
- // Import the Trees for the event nEvent in the file
- //fRunLoader->GetEvent(fEvent);
+ AliLoader *loader = fRunLoader->GetLoader("TRDLoader");
+ if (!loader) {
+ AliError("Can not get TRD loader from Run Loader");
+ return kFALSE;
+ }
- AliLoader* loader = fRunLoader->GetLoader("TRDLoader");
+ if (InitDetector()) {
+ TTree *tree = 0;
+ if (fSDigits) {
+ // If we produce SDigits
+ tree = loader->TreeS();
+ if (!tree) {
+ loader->MakeTree("S");
+ tree = loader->TreeS();
+ }
+ }
+ else {
+ // If we produce Digits
+ tree = loader->TreeD();
+ if (!tree) {
+ loader->MakeTree("D");
+ tree = loader->TreeD();
+ }
+ }
+ return MakeBranch(tree);
+ }
+ else {
+ return kFALSE;
+ }
+
+}
+
+//_____________________________________________________________________________
+Bool_t AliTRDdigitizer::Open(AliRunLoader *runLoader, Int_t nEvent)
+{
+ //
+ // Opens a ROOT-file with TRD-hits and reads in the hit-tree
+ //
+ // Connect the AliRoot file containing Geometry, Kine, and Hits
+ //
+
+ fRunLoader = runLoader;
+ if (!fRunLoader) {
+ AliError("RunLoader does not exist");
+ return kFALSE;
+ }
+
+ if (!fRunLoader->GetAliRun()) {
+ fRunLoader->LoadgAlice();
+ }
+ gAlice = fRunLoader->GetAliRun();
+
+ if (gAlice) {
+ AliDebug(1,"AliRun object found on file.\n");
+ }
+ else {
+ AliError("Could not find AliRun object.\n");
+ return kFALSE;
+ }
+
+ fEvent = nEvent;
+
+ AliLoader *loader = fRunLoader->GetLoader("TRDLoader");
if (!loader) {
AliError("Can not get TRD loader from Run Loader");
return kFALSE;
}
if (InitDetector()) {
- TTree* tree = 0;
+ TTree *tree = 0;
if (fSDigits) {
// If we produce SDigits
tree = loader->TreeS();
if (!tree) {
loader->MakeTree("S");
tree = loader->TreeS();
- }
+ }
}
else {
// If we produce Digits
+ tree = loader->TreeD();
if (!tree) {
loader->MakeTree("D");
tree = loader->TreeD();
- }
+ }
}
return MakeBranch(tree);
}
}
//_____________________________________________________________________________
-Bool_t AliTRDdigitizer::MakeBranch(TTree* tree) const
+Bool_t AliTRDdigitizer::MakeBranch(TTree *tree) const
{
//
// Create the branches for the digits array
///////////////////////////////////////////////////////////////
// Converts number of electrons to fC
- const Double_t kEl2fC = 1.602E-19 * 1.0E15;
+ const Double_t kEl2fC = 1.602e-19 * 1.0e15;
///////////////////////////////////////////////////////////////
const Int_t kNDict = AliTRDdigitsManager::kNDict;
// Half the width of the amplification region
- const Float_t kAmWidth = AliTRDgeometry::AmThick() / 2.;
+ const Float_t kAmWidth = AliTRDgeometry::AmThick() / 2.0;
// Width of the drift region
const Float_t kDrWidth = AliTRDgeometry::DrThick();
- Int_t iRow, iCol, iTime, iPad;
+ Int_t iRow;
+ Int_t iCol;
+ Int_t iTime;
+ Int_t iPad;
Int_t iDict = 0;
Int_t nBytes = 0;
AliTRDCommonParam *commonParam = AliTRDCommonParam::Instance();
if (!commonParam) {
- AliError("Could not get common params\n");
+ AliError("Could not get common parameterss\n");
return kFALSE;
}
if (simParam->TRFOn()) {
timeBinTRFend = ((Int_t) (simParam->GetTRFhi()
- * calibration->GetSamplingFrequency())) - 1;
+ * commonParam->GetSamplingFrequency())) - 1;
AliDebug(1,Form("Sample the TRF up to bin %d\n",timeBinTRFend));
}
- Float_t elAttachProp = simParam->GetElAttachProp() / 100.;
+ Float_t elAttachProp = simParam->GetElAttachProp() / 100.0;
if (!fGeo) {
AliError("No geometry defined\n");
AliDebug(1,"Start creating digits.\n");
- AliLoader* gimme = fRunLoader->GetLoader("TRDLoader");
+ AliLoader *gimme = fRunLoader->GetLoader("TRDLoader");
if (!gimme->TreeH()) {
gimme->LoadHits();
}
- TTree* hitTree = gimme->TreeH();
+ TTree *hitTree = gimme->TreeH();
if (hitTree == 0x0) {
AliError("Can not get TreeH");
return kFALSE;
// (Number of primary particles creating a hit somewhere)
Int_t nTrack = (Int_t) hitTree->GetEntries();
AliDebug(1,Form("Found %d primary particles\n",nTrack));
- AliDebug(1,Form("Sampling = %.0fMHz\n" ,calibration->GetSamplingFrequency()));
+ AliDebug(1,Form("Sampling = %.0fMHz\n" ,commonParam->GetSamplingFrequency()));
AliDebug(1,Form("Gain = %d\n" ,((Int_t) simParam->GetGasGain())));
- AliDebug(1,Form("Noise = %d\n" ,((Int_t) simParam->GetNoise())));
+ AliDebug(1,Form("Noise = %d\n" ,((Int_t) simParam->GetNoise())));
if (simParam->TimeStructOn()) {
AliDebug(1,"Time Structure of drift cells implemented.\n");
}
Int_t countHits = 0;
Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
- Float_t samplingRate = calibration->GetSamplingFrequency();
+ Float_t samplingRate = commonParam->GetSamplingFrequency();
// Loop through all entries in the tree
for (Int_t iTrack = 0; iTrack < nTrack; iTrack++) {
countHits++;
iHit++;
- pos[0] = hit->X();
- pos[1] = hit->Y();
- pos[2] = hit->Z();
- Float_t q = hit->GetCharge();
- Int_t track = hit->Track();
- Int_t detector = hit->GetDetector();
- Int_t plane = fGeo->GetPlane(detector);
- Int_t chamber = fGeo->GetChamber(detector);
- Float_t time0 = AliTRDgeometry::GetTime0(plane);
-
- padPlane = commonParam->GetPadPlane(plane,chamber);
- Float_t row0 = padPlane->GetRow0();
- Int_t nRowMax = padPlane->GetNrows();
- Int_t nColMax = padPlane->GetNcols();
- Int_t inDrift = 1;
-
+ Float_t q = hit->GetCharge();
// Don't analyze test hits
- if (((Int_t) q) != 0) {
-
- if (detector != detectorOld) {
+ if (((Int_t) q) == 0) {
+ hit = (AliTRDhit *) fTRD->NextHit();
+ continue;
+ }
- // Compress the old one if enabled
- if ((fCompress) && (detectorOld > -1)) {
- AliDebug(1,"Compress the old container ...");
- signals->Compress(1,0);
- for (iDict = 0; iDict < kNDict; iDict++) {
- dictionary[iDict]->Compress(1,0);
- }
+ pos[0] = hit->X();
+ pos[1] = hit->Y();
+ pos[2] = hit->Z();
+ Int_t track = hit->Track();
+ Int_t detector = hit->GetDetector();
+ Int_t plane = fGeo->GetPlane(detector);
+ Int_t chamber = fGeo->GetChamber(detector);
+ Float_t time0 = AliTRDgeometry::GetTime0(plane);
+ padPlane = commonParam->GetPadPlane(plane,chamber);
+ Float_t row0 = padPlane->GetRow0();
+ Int_t nRowMax = padPlane->GetNrows();
+ Int_t nColMax = padPlane->GetNcols();
+ Int_t inDrift = 1;
+
+ // Find the current volume with the geo manager
+ gGeoManager->SetCurrentPoint(pos);
+ gGeoManager->FindNode();
+ if (strstr(gGeoManager->GetPath(),"/UK")) {
+ inDrift = 0;
+ }
+
+ if (detector != detectorOld) {
+
+ // Compress the old one if enabled
+ if ((fCompress) && (detectorOld > -1)) {
+ signals->Compress(1,0);
+ for (iDict = 0; iDict < kNDict; iDict++) {
+ dictionary[iDict]->Compress(1,0);
+ }
+ }
+ // Get the new container
+ signals = (AliTRDdataArrayF *) signalsArray->At(detector);
+ if (signals->GetNtime() == 0) {
+ // Allocate a new one if not yet existing
+ signals->Allocate(nRowMax,nColMax,nTimeTotal);
+ }
+ else {
+ // Expand an existing one
+ if (fCompress) {
+ signals->Expand();
}
- // Get the new container
- signals = (AliTRDdataArrayF *) signalsArray->At(detector);
- if (signals->GetNtime() == 0) {
- // Allocate a new one if not yet existing
- signals->Allocate(nRowMax,nColMax,nTimeTotal);
+ }
+ // The same for the dictionary
+ for (iDict = 0; iDict < kNDict; iDict++) {
+ dictionary[iDict] = fDigitsManager->GetDictionary(detector,iDict);
+ if (dictionary[iDict]->GetNtime() == 0) {
+ dictionary[iDict]->Allocate(nRowMax,nColMax,nTimeTotal);
}
else {
- // Expand an existing one
- if (fCompress) {
- signals->Expand();
- }
- }
- // The same for the dictionary
- for (iDict = 0; iDict < kNDict; iDict++) {
- dictionary[iDict] = fDigitsManager->GetDictionary(detector,iDict);
- if (dictionary[iDict]->GetNtime() == 0) {
- dictionary[iDict]->Allocate(nRowMax,nColMax,nTimeTotal);
- }
- else {
- if (fCompress) dictionary[iDict]->Expand();
- }
- }
- detectorOld = detector;
- }
+ if (fCompress) dictionary[iDict]->Expand();
+ }
+ }
+ detectorOld = detector;
+ }
- // Rotate the sectors on top of each other
- // by using the geoManager
- Double_t aaa[3];
- gGeoManager->MasterToLocal(pos,aaa);
- if (inDrift) {
- aaa[2] = time0 - (kDrWidth / 2.0 + kAmWidth) + aaa[2];
- }
- else {
- aaa[2] = time0 + aaa[2];
- }
- aaa[1] = row0 + padPlane->GetLengthRim() + fGeo->RpadW()
- - 0.5 * fGeo->GetChamberLength(plane,chamber)
- + aaa[1];
- rot[0] = aaa[2];
- rot[1] = aaa[0];
- rot[2] = aaa[1];
-
- // The driftlength. It is negative if the hit is between pad plane and anode wires.
- Double_t driftlength = time0 - rot[0];
-
- // Loop over all electrons of this hit
- // TR photons produce hits with negative charge
- Int_t nEl = ((Int_t) TMath::Abs(q));
- for (Int_t iEl = 0; iEl < nEl; iEl++) {
-
- xyz[0] = rot[0];
- xyz[1] = rot[1];
- xyz[2] = rot[2];
-
- // Stupid patch to take care of TR photons that are absorbed
- // outside the chamber volume. A real fix would actually need
- // a more clever implementation of the TR hit generation
- if (q < 0.0) {
- if ((xyz[2] < padPlane->GetRowEnd()) ||
- (xyz[2] > padPlane->GetRow0())) {
- if (iEl == 0) {
- AliDebug(2,Form("Hit outside of sensitive volume, row (z=%f, row0=%f, rowE=%f)\n"
- ,xyz[2],padPlane->GetRow0(),padPlane->GetRowEnd()));
- }
- continue;
+ // Rotate the sectors on top of each other
+ // by using the geoManager
+ Double_t aaa[3];
+ gGeoManager->MasterToLocal(pos,aaa);
+ if (inDrift) {
+ aaa[2] = time0 - (kDrWidth / 2.0 + kAmWidth) + aaa[2];
+ }
+ else {
+ aaa[2] = time0 + aaa[2];
+ }
+ aaa[1] = row0 + padPlane->GetLengthRim() + fGeo->RpadW()
+ - 0.5 * fGeo->GetChamberLength(plane,chamber)
+ + aaa[1];
+ rot[0] = aaa[2];
+ rot[1] = aaa[0];
+ rot[2] = aaa[1];
+
+ // The driftlength. It is negative if the hit is between pad plane and anode wires.
+ Double_t driftlength = time0 - rot[0];
+
+ // Loop over all electrons of this hit
+ // TR photons produce hits with negative charge
+ Int_t nEl = ((Int_t) TMath::Abs(q));
+ for (Int_t iEl = 0; iEl < nEl; iEl++) {
+
+ xyz[0] = rot[0];
+ xyz[1] = rot[1];
+ xyz[2] = rot[2];
+
+ // Stupid patch to take care of TR photons that are absorbed
+ // outside the chamber volume. A real fix would actually need
+ // a more clever implementation of the TR hit generation
+ if (q < 0.0) {
+ if ((xyz[2] < padPlane->GetRowEnd()) ||
+ (xyz[2] > padPlane->GetRow0())) {
+ if (iEl == 0) {
+ AliDebug(2,Form("Hit outside of sensitive volume, row (z=%f, row0=%f, rowE=%f)\n"
+ ,xyz[2],padPlane->GetRow0(),padPlane->GetRowEnd()));
}
- Float_t tt = driftlength + kAmWidth;
- if (tt < 0.0 || tt > kDrWidth + 2.*kAmWidth) {
- if (iEl == 0) {
- AliDebug(2,Form("Hit outside of sensitive volume, time (Q = %d)\n"
- ,((Int_t) q)));
- }
- continue;
+ continue;
+ }
+ Float_t tt = driftlength + kAmWidth;
+ if ((tt < 0.0) ||
+ (tt > kDrWidth + 2.0*kAmWidth)) {
+ if (iEl == 0) {
+ AliDebug(2,Form("Hit outside of sensitive volume, time (Q = %d)\n"
+ ,((Int_t) q)));
}
+ continue;
}
+ }
- // Get row and col of unsmeared electron to retrieve drift velocity
- // The pad row (z-direction)
- Int_t rowE = padPlane->GetPadRowNumber(xyz[2]);
- if (rowE < 0) continue;
- Double_t rowOffset = padPlane->GetPadRowOffset(rowE,xyz[2]);
+ // Get row and col of unsmeared electron to retrieve drift velocity
+ // The pad row (z-direction)
+ Int_t rowE = padPlane->GetPadRowNumber(xyz[2]);
+ if (rowE < 0) continue;
+ Double_t rowOffset = padPlane->GetPadRowOffset(rowE,xyz[2]);
- // The pad column (rphi-direction)
- Double_t offsetTilt = padPlane->GetTiltOffset(rowOffset);
- Int_t colE = padPlane->GetPadColNumber(xyz[1]+offsetTilt,rowOffset);
- if (colE < 0) continue;
- Double_t colOffset = padPlane->GetPadColOffset(colE,xyz[1]+offsetTilt);
+ // The pad column (rphi-direction)
+ Double_t offsetTilt = padPlane->GetTiltOffset(rowOffset);
+ Int_t colE = padPlane->GetPadColNumber(xyz[1]+offsetTilt,rowOffset);
+ if (colE < 0) continue;
+ Double_t colOffset = padPlane->GetPadColOffset(colE,xyz[1]+offsetTilt);
- Float_t driftvelocity = calibration->GetVdrift(detector,colE,rowE);
+ Float_t driftvelocity = calibration->GetVdrift(detector,colE,rowE);
- // Normalised drift length
- Double_t absdriftlength = TMath::Abs(driftlength);
- if (commonParam->ExBOn()) {
- absdriftlength /= TMath::Sqrt(GetLorentzFactor(driftvelocity));
- }
+ // Normalised drift length
+ Double_t absdriftlength = TMath::Abs(driftlength);
+ if (commonParam->ExBOn()) {
+ absdriftlength /= TMath::Sqrt(GetLorentzFactor(driftvelocity));
+ }
- // Electron attachment
- if (simParam->ElAttachOn()) {
- if (gRandom->Rndm() < (absdriftlength * elAttachProp)) continue;
- }
+ // Electron attachment
+ if (simParam->ElAttachOn()) {
+ if (gRandom->Rndm() < (absdriftlength * elAttachProp)) continue;
+ }
- // Apply the diffusion smearing
- if (simParam->DiffusionOn()) {
- if (!(Diffusion(driftvelocity, absdriftlength,xyz))) continue;
- }
+ // Apply the diffusion smearing
+ if (simParam->DiffusionOn()) {
+ if (!(Diffusion(driftvelocity,absdriftlength,xyz))) continue;
+ }
- // Apply E x B effects (depends on drift direction)
- if (commonParam->ExBOn()) {
- if (!(ExB(driftvelocity, driftlength,xyz))) continue;
- }
+ // Apply E x B effects (depends on drift direction)
+ if (commonParam->ExBOn()) {
+ if (!(ExB(driftvelocity,driftlength,xyz))) continue;
+ }
- // The electron position after diffusion and ExB in pad coordinates.
- // The pad row (z-direction)
- rowE = padPlane->GetPadRowNumber(xyz[2]);
- if (rowE < 0) continue;
- rowOffset = padPlane->GetPadRowOffset(rowE,xyz[2]);
-
- // The pad column (rphi-direction)
- offsetTilt = padPlane->GetTiltOffset(rowOffset);
- colE = padPlane->GetPadColNumber(xyz[1]+offsetTilt,rowOffset);
- if (colE < 0) continue;
- colOffset = padPlane->GetPadColOffset(colE,xyz[1]+offsetTilt);
+ // The electron position after diffusion and ExB in pad coordinates.
+ // The pad row (z-direction)
+ rowE = padPlane->GetPadRowNumber(xyz[2]);
+ if (rowE < 0) continue;
+ rowOffset = padPlane->GetPadRowOffset(rowE,xyz[2]);
+
+ // The pad column (rphi-direction)
+ offsetTilt = padPlane->GetTiltOffset(rowOffset);
+ colE = padPlane->GetPadColNumber(xyz[1]+offsetTilt,rowOffset);
+ if (colE < 0) continue;
+ colOffset = padPlane->GetPadColOffset(colE,xyz[1]+offsetTilt);
- // Also re-retrieve drift velocity because col and row may have changed
- driftvelocity = calibration->GetVdrift(detector,colE,rowE);
- Float_t t0 = calibration->GetT0(detector,colE,rowE);
+ // Also re-retrieve drift velocity because col and row may have changed
+ driftvelocity = calibration->GetVdrift(detector,colE,rowE);
+ Float_t t0 = calibration->GetT0(detector,colE,rowE);
- // Convert the position to drift time, using either constant drift velocity or
- // time structure of drift cells (non-isochronity, GARFIELD calculation).
- Double_t drifttime;
- if (simParam->TimeStructOn()) {
- // Get z-position with respect to anode wire:
- Double_t Z = row0 - xyz[2] + simParam->GetAnodeWireOffset();
- Z -= ((Int_t)(2*Z))/2.0;
- if (Z > 0.25) {
- Z = 0.5 - Z;
- }
- // Use drift time map (GARFIELD)
- drifttime = TimeStruct(driftvelocity,time0-xyz[0]+kAmWidth,Z);
- }
- else {
- // use constant drift velocity
- drifttime = TMath::Abs(time0 - xyz[0]) / driftvelocity;
+ // Convert the position to drift time, using either constant drift velocity or
+ // time structure of drift cells (non-isochronity, GARFIELD calculation).
+ Double_t drifttime;
+ if (simParam->TimeStructOn()) {
+ // Get z-position with respect to anode wire:
+ Double_t Z = row0 - xyz[2] + simParam->GetAnodeWireOffset();
+ Z -= ((Int_t)(2 * Z)) / 2.0;
+ if (Z > 0.25) {
+ Z = 0.5 - Z;
}
+ // Use drift time map (GARFIELD)
+ drifttime = TimeStruct(driftvelocity,time0-xyz[0]+kAmWidth,Z);
+ }
+ else {
+ // Use constant drift velocity
+ drifttime = TMath::Abs(time0 - xyz[0]) / driftvelocity;
+ }
- // Apply the gas gain including fluctuations
- Double_t ggRndm = 0.0;
- do {
- ggRndm = gRandom->Rndm();
- } while (ggRndm <= 0);
- Int_t signal = (Int_t) (-(simParam->GetGasGain()) * TMath::Log(ggRndm));
-
- // Apply the pad response
- if (simParam->PRFOn()) {
- // The distance of the electron to the center of the pad
- // in units of pad width
- Double_t dist = (colOffset - 0.5*padPlane->GetColSize(colE))
- / padPlane->GetColSize(colE);
- if (!(calibration->PadResponse(signal,dist,plane,padSignal))) continue;
- }
- else {
- padSignal[0] = 0.0;
- padSignal[1] = signal;
- padSignal[2] = 0.0;
- }
+ // Apply the gas gain including fluctuations
+ Double_t ggRndm = 0.0;
+ do {
+ ggRndm = gRandom->Rndm();
+ } while (ggRndm <= 0);
+ Int_t signal = (Int_t) (-(simParam->GetGasGain()) * TMath::Log(ggRndm));
+
+ // Apply the pad response
+ if (simParam->PRFOn()) {
+ // The distance of the electron to the center of the pad
+ // in units of pad width
+ Double_t dist = (colOffset - 0.5*padPlane->GetColSize(colE))
+ / padPlane->GetColSize(colE);
+ if (!(calibration->PadResponse(signal,dist,plane,padSignal))) continue;
+ }
+ else {
+ padSignal[0] = 0.0;
+ padSignal[1] = signal;
+ padSignal[2] = 0.0;
+ }
- // The time bin (always positive), with t0 correction
- Double_t timeBinIdeal = drifttime * samplingRate + t0;
- // Protection
- if (TMath::Abs(timeBinIdeal) > 2*nTimeTotal) {
- timeBinIdeal = 2 * nTimeTotal;
- }
- Int_t timeBinTruncated = (Int_t) timeBinIdeal;
- // The distance of the position to the middle of the timebin
- Double_t timeOffset = ((Float_t) timeBinTruncated
- + 0.5 - timeBinIdeal) / samplingRate;
+ // The time bin (always positive), with t0 correction
+ Double_t timeBinIdeal = drifttime * samplingRate + t0;
+ // Protection
+ if (TMath::Abs(timeBinIdeal) > 2*nTimeTotal) {
+ timeBinIdeal = 2 * nTimeTotal;
+ }
+ Int_t timeBinTruncated = (Int_t) timeBinIdeal;
+ // The distance of the position to the middle of the timebin
+ Double_t timeOffset = ((Float_t) timeBinTruncated
+ + 0.5 - timeBinIdeal) / samplingRate;
- // Sample the time response inside the drift region
- // + additional time bins before and after.
- // The sampling is done always in the middle of the time bin
- for (Int_t iTimeBin = TMath::Max(timeBinTruncated, 0);
- iTimeBin < TMath::Min(timeBinTruncated+timeBinTRFend,nTimeTotal);
- iTimeBin++) {
-
- // Apply the time response
- Double_t timeResponse = 1.0;
- Double_t crossTalk = 0.0;
- Double_t time = (iTimeBin - timeBinTruncated) / samplingRate + timeOffset;
- if (simParam->TRFOn()) {
- timeResponse = simParam->TimeResponse(time);
- }
-
- if (simParam->CTOn()) {
- crossTalk = simParam->CrossTalk(time);
- }
+ // Sample the time response inside the drift region
+ // + additional time bins before and after.
+ // The sampling is done always in the middle of the time bin
+ for (Int_t iTimeBin = TMath::Max(timeBinTruncated, 0);
+ iTimeBin < TMath::Min(timeBinTruncated+timeBinTRFend,nTimeTotal);
+ iTimeBin++) {
+
+ // Apply the time response
+ Double_t timeResponse = 1.0;
+ Double_t crossTalk = 0.0;
+ Double_t time = (iTimeBin - timeBinTruncated) / samplingRate + timeOffset;
+ if (simParam->TRFOn()) {
+ timeResponse = simParam->TimeResponse(time);
+ }
+ if (simParam->CTOn()) {
+ crossTalk = simParam->CrossTalk(time);
+ }
- signalOld[0] = 0.0;
- signalOld[1] = 0.0;
- signalOld[2] = 0.0;
+ signalOld[0] = 0.0;
+ signalOld[1] = 0.0;
+ signalOld[2] = 0.0;
- for (iPad = 0; iPad < kNpad; iPad++) {
+ for (iPad = 0; iPad < kNpad; iPad++) {
- Int_t colPos = colE + iPad - 1;
- if (colPos < 0) continue;
- if (colPos >= nColMax) break;
+ Int_t colPos = colE + iPad - 1;
+ if (colPos < 0) continue;
+ if (colPos >= nColMax) break;
- // Add the signals
- Int_t iCurrentTimeBin = iTimeBin;
- signalOld[iPad] = signals->GetDataUnchecked(rowE,colPos,iCurrentTimeBin);
- if( colPos != colE ) {
- signalOld[iPad] += padSignal[iPad] * (timeResponse + crossTalk);
- }
- else {
- signalOld[iPad] += padSignal[iPad] * timeResponse;
- }
- signals->SetDataUnchecked(rowE,colPos,iCurrentTimeBin,signalOld[iPad]);
-
- // Store the track index in the dictionary
- // Note: We store index+1 in order to allow the array to be compressed
- if (signalOld[iPad] > 0) {
- for (iDict = 0; iDict < kNDict; iDict++) {
- Int_t oldTrack = dictionary[iDict]->GetDataUnchecked(rowE
- ,colPos
- ,iCurrentTimeBin);
- if (oldTrack == track+1) break;
- if (oldTrack == 0) {
- dictionary[iDict]->SetDataUnchecked(rowE,colPos,iCurrentTimeBin,track+1);
- break;
- }
+ // Add the signals
+ Int_t iCurrentTimeBin = iTimeBin;
+ signalOld[iPad] = signals->GetDataUnchecked(rowE,colPos,iCurrentTimeBin);
+ if (colPos != colE) {
+ signalOld[iPad] += padSignal[iPad] * (timeResponse + crossTalk);
+ }
+ else {
+ signalOld[iPad] += padSignal[iPad] * timeResponse;
+ }
+ signals->SetDataUnchecked(rowE,colPos,iCurrentTimeBin,signalOld[iPad]);
+
+ // Store the track index in the dictionary
+ // Note: We store index+1 in order to allow the array to be compressed
+ if (signalOld[iPad] > 0) {
+ for (iDict = 0; iDict < kNDict; iDict++) {
+ Int_t oldTrack = dictionary[iDict]->GetDataUnchecked(rowE
+ ,colPos
+ ,iCurrentTimeBin);
+ if (oldTrack == track+1) break;
+ if (oldTrack == 0) {
+ dictionary[iDict]->SetDataUnchecked(rowE,colPos,iCurrentTimeBin,track+1);
+ break;
}
}
+ }
- } // Loop: pads
-
- } // Loop: time bins
+ } // Loop: pads
- } // Loop: electrons of a single hit
+ } // Loop: time bins
- } // If: detector and test hit
+ } // Loop: electrons of a single hit
hit = (AliTRDhit *) fTRD->NextHit();
Int_t iDetEnd = AliTRDgeometry::Ndet();
for (Int_t iDet = iDetBeg; iDet < iDetEnd; iDet++) {
- Int_t plane = fGeo->GetPlane(iDet);
- Int_t sector = fGeo->GetSector(iDet);
- Int_t chamber = fGeo->GetChamber(iDet);
- Int_t nRowMax = commonParam->GetRowMax(plane,chamber,sector);
- Int_t nColMax = commonParam->GetColMax(plane);
-
- Double_t *inADC = new Double_t[nTimeTotal];
- Double_t *outADC = new Double_t[nTimeTotal];
+ Int_t plane = fGeo->GetPlane(iDet);
+ Int_t sector = fGeo->GetSector(iDet);
+ Int_t chamber = fGeo->GetChamber(iDet);
+ Int_t nRowMax = commonParam->GetRowMax(plane,chamber,sector);
+ Int_t nColMax = commonParam->GetColMax(plane);
- AliDebug(1,Form("Digitization for chamber %d\n",iDet));
+ Double_t *inADC = new Double_t[nTimeTotal];
+ Double_t *outADC = new Double_t[nTimeTotal];
// Add a container for the digits of this detector
digits = fDigitsManager->GetDigits(iDet);
Int_t nDigits = 0;
// Don't create noise in detectors that are switched off / not installed, etc.
- if (!calibration->GetChamberStatus(iDet)) {
+ if (( calibration->IsChamberInstalled(iDet)) &&
+ (!calibration->IsChamberMasked(iDet)) &&
+ ( fGeo->GetSMstatus(sector))) {
// Create the digits for this chamber
for (iRow = 0; iRow < nRowMax; iRow++ ) {
for (iCol = 0; iCol < nColMax; iCol++ ) {
- // Check whether pad is active / installed / whatever ...
- if (calibration->GetPadStatus(iDet,iCol,iRow)) continue;
- // Check whether MCM is active / installed / whatever ...
- if (calibration->GetMCMStatus(iDet,iCol,iRow)) continue;
+ // Check whether pad is masked
+ // Bridged pads are not considered yet!!!
+ if (calibration->IsPadMasked(iDet,iCol,iRow)) continue;
// Create summable digits
if (fSDigits) {
else {
for (iTime = 0; iTime < nTimeTotal; iTime++) {
+
Float_t signalAmp = signals->GetDataUnchecked(iRow,iCol,iTime);
// Pad and time coupling
signalAmp *= coupling;
- Float_t padgain = calibration->GetGainFactor(iDet, iCol, iRow);
+ Float_t padgain = calibration->GetGainFactor(iDet,iCol,iRow);
if (padgain <= 0) {
- AliError(Form("Not a valid gain %f, %d %d %d\n", padgain, iDet, iCol, iRow));
+ AliError(Form("Not a valid gain %f, %d %d %d\n",padgain,iDet,iCol,iRow));
}
signalAmp *= padgain;
// Add the noise, starting from minus ADC baseline in electrons
Double_t baselineEl = simParam->GetADCbaseline() * (simParam->GetADCinRange()
- / simParam->GetADCoutRange())
- / convert;
+ / simParam->GetADCoutRange())
+ / convert;
signalAmp = TMath::Max((Double_t) gRandom->Gaus(signalAmp,simParam->GetNoise())
,-baselineEl);
// Convert to mV
signalAmp *= convert;
// Add ADC baseline in mV
signalAmp += simParam->GetADCbaseline() * (simParam->GetADCinRange()
- / simParam->GetADCoutRange());
+ / simParam->GetADCoutRange());
// Convert to ADC counts. Set the overflow-bit fADCoutRange if the
// signal is larger than fADCinRange
Int_t adc = 0;
}
else {
adc = TMath::Nint(signalAmp * (simParam->GetADCoutRange()
- / simParam->GetADCinRange()));
+ / simParam->GetADCinRange()));
}
inADC[iTime] = adc;
outADC[iTime] = adc;
+
}
for (iTime = 0; iTime < nTimeTotal; iTime++) {
totalSizeDict1 += dictionary[1]->GetSize();
totalSizeDict2 += dictionary[2]->GetSize();
- Float_t nPixel = nRowMax * nColMax * nTimeTotal;
- AliDebug(1,Form("Found %d digits in detector %d (%3.0f).\n"
- ,nDigits,iDet
- ,100.0 * ((Float_t) nDigits) / nPixel));
+ if (nDigits > 0) {
+ Float_t nPixel = nRowMax * nColMax * nTimeTotal;
+ AliDebug(1,Form("Found %d digits in detector %d (%3.0f).\n"
+ ,nDigits,iDet
+ ,100.0 * ((Float_t) nDigits) / nPixel));
+ }
if (fCompress) {
signals->Compress(1,0);
const Int_t kNDict = AliTRDdigitsManager::kNDict;
// Converts number of electrons to fC
- const Double_t kEl2fC = 1.602E-19 * 1.0E15;
+ const Double_t kEl2fC = 1.602e-19 * 1.0e15;
Int_t iDict = 0;
Int_t iRow;
Int_t iCol;
Int_t iTime;
- AliTRDSimParam* simParam = AliTRDSimParam::Instance();
+ AliTRDSimParam *simParam = AliTRDSimParam::Instance();
if (!simParam) {
AliError("Could not get simulation parameters\n");
return kFALSE;
}
- AliTRDCommonParam* commonParam = AliTRDCommonParam::Instance();
+ AliTRDCommonParam *commonParam = AliTRDCommonParam::Instance();
if (!commonParam) {
AliError("Could not get common parameters\n");
return kFALSE;
}
- AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
+ AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
if (!calibration) {
AliError("Could not get calibration object\n");
return kFALSE;
Double_t adcOutRange = simParam->GetADCoutRange();
Int_t adcThreshold = simParam->GetADCthreshold();
Int_t adcBaseline = simParam->GetADCbaseline();
-
Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
AliTRDdataArrayI *digitsIn;
// Loop through the detectors
for (Int_t iDet = 0; iDet < AliTRDgeometry::Ndet(); iDet++) {
- AliDebug(1,Form("Convert detector %d to digits.\n",iDet));
-
Int_t plane = fGeo->GetPlane(iDet);
Int_t sector = fGeo->GetSector(iDet);
Int_t chamber = fGeo->GetChamber(iDet);
dictionaryOut[iDict]->Allocate(nRowMax,nColMax,nTimeTotal);
}
- for (iRow = 0; iRow < nRowMax; iRow++ ) {
- for (iCol = 0; iCol < nColMax; iCol++ ) {
+ // Don't create noise in detectors that are switched off / not installed, etc.
+ if (( calibration->IsChamberInstalled(iDet)) &&
+ (!calibration->IsChamberMasked(iDet)) &&
+ ( fGeo->GetSMstatus(sector))) {
- for (iTime = 0; iTime < nTimeTotal; iTime++) {
+ for (iRow = 0; iRow < nRowMax; iRow++ ) {
+ for (iCol = 0; iCol < nColMax; iCol++ ) {
- Double_t signal = (Double_t) digitsIn->GetDataUnchecked(iRow,iCol,iTime);
- signal *= sDigitsScale;
- Float_t padgain = calibration->GetGainFactor(iDet,iCol,iRow);
- if (padgain <= 0.0) {
- AliError(Form("Not a valid gain %f, %d %d %d\n", padgain, iDet, iCol, iRow));
- }
+ // Check whether pad is masked
+ // Bridged pads are not considered yet!!!
+ if (calibration->IsPadMasked(iDet,iCol,iRow)) continue;
- signal *= padgain;
- // Pad and time coupling
- signal *= coupling;
- // Add the noise, starting from minus ADC baseline in electrons
- Double_t baselineEl = adcBaseline * (adcInRange / adcOutRange) / convert;
- signal = TMath::Max((Double_t) gRandom->Gaus(signal,noise),-baselineEl);
- // Convert to mV
- signal *= convert;
- // add ADC baseline in mV
- signal += adcBaseline * (adcInRange / adcOutRange);
- // Convert to ADC counts. Set the overflow-bit adcOutRange if the
- // signal is larger than adcInRange
- Int_t adc = 0;
- if (signal >= adcInRange) {
- adc = ((Int_t) adcOutRange);
- }
- else {
- adc = TMath::Nint(signal * (adcOutRange / adcInRange));
- }
- inADC[iTime] = adc;
- outADC[iTime] = adc;
+ for (iTime = 0; iTime < nTimeTotal; iTime++) {
- }
+ // Scale s-digits to normal digits
+ Double_t signal = (Double_t) digitsIn->GetDataUnchecked(iRow,iCol,iTime);
+ signal *= sDigitsScale;
+ // Apply the pad-by-pad gain factors
+ Float_t padgain = calibration->GetGainFactor(iDet,iCol,iRow);
+ if (padgain <= 0.0) {
+ AliError(Form("Not a valid gain %f, %d %d %d\n",padgain,iDet,iCol,iRow));
+ }
+ signal *= padgain;
+ // Pad and time coupling
+ signal *= coupling;
+ // Add the noise, starting from minus ADC baseline in electrons
+ Double_t baselineEl = adcBaseline * (adcInRange / adcOutRange) / convert;
+ signal = TMath::Max((Double_t) gRandom->Gaus(signal,noise),-baselineEl);
+ // Convert to mV
+ signal *= convert;
+ // add ADC baseline in mV
+ signal += adcBaseline * (adcInRange / adcOutRange);
+ // Convert to ADC counts. Set the overflow-bit adcOutRange if the
+ // signal is larger than adcInRange
+ Int_t adc = 0;
+ if (signal >= adcInRange) {
+ adc = ((Int_t) adcOutRange);
+ }
+ else {
+ adc = TMath::Nint(signal * (adcOutRange / adcInRange));
+ }
+ inADC[iTime] = adc;
+ outADC[iTime] = adc;
- for (iTime = 0; iTime < nTimeTotal; iTime++) {
- // Store the amplitude of the digit if above threshold
- if (outADC[iTime] > adcThreshold) {
- digitsOut->SetDataUnchecked(iRow,iCol,iTime,((Int_t) outADC[iTime]));
- // Copy the dictionary
- for (iDict = 0; iDict < kNDict; iDict++) {
- Int_t track = dictionaryIn[iDict]->GetDataUnchecked(iRow,iCol,iTime);
- dictionaryOut[iDict]->SetDataUnchecked(iRow,iCol,iTime,track);
+ }
+
+ for (iTime = 0; iTime < nTimeTotal; iTime++) {
+ // Store the amplitude of the digit if above threshold
+ if (outADC[iTime] > adcThreshold) {
+ digitsOut->SetDataUnchecked(iRow,iCol,iTime,((Int_t) outADC[iTime]));
+ // Copy the dictionary
+ for (iDict = 0; iDict < kNDict; iDict++) {
+ Int_t track = dictionaryIn[iDict]->GetDataUnchecked(iRow,iCol,iTime);
+ dictionaryOut[iDict]->SetDataUnchecked(iRow,iCol,iTime,track);
+ }
}
}
- }
+ }
}
+
}
if (fCompress) {
// Number of track dictionary arrays
const Int_t kNDict = AliTRDdigitsManager::kNDict;
- AliTRDSimParam* simParam = AliTRDSimParam::Instance();
+ AliTRDSimParam *simParam = AliTRDSimParam::Instance();
if (!simParam) {
AliError("Could not get simulation parameters\n");
return kFALSE;
}
- AliTRDCommonParam* commonParam = AliTRDCommonParam::Instance();
+ AliTRDCommonParam *commonParam = AliTRDCommonParam::Instance();
if (!commonParam) {
AliError("Could not get common parameters\n");
return kFALSE;
}
- AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
+ AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
if (!calibration) {
AliError("Could not get calibration object\n");
return kFALSE;
// Loop through the other sets of s-digits
AliTRDdigitsManager *mergeSDigitsManager;
- mergeSDigitsManager = (AliTRDdigitsManager *) fSDigitsManagerList->After(fSDigitsManager);
+ mergeSDigitsManager = (AliTRDdigitsManager *)
+ fSDigitsManagerList->After(fSDigitsManager);
if (mergeSDigitsManager) {
AliDebug(1,Form("Merge %d input files.\n",fSDigitsManagerList->GetSize()));
// Loop through the detectors
for (Int_t iDet = 0; iDet < AliTRDgeometry::Ndet(); iDet++) {
- Int_t plane = fGeo->GetPlane(iDet);
- Int_t sector = fGeo->GetSector(iDet);
- Int_t chamber = fGeo->GetChamber(iDet);
- Int_t nRowMax = commonParam->GetRowMax(plane,chamber,sector);
- Int_t nColMax = commonParam->GetColMax(plane);
+ Int_t plane = fGeo->GetPlane(iDet);
+ Int_t sector = fGeo->GetSector(iDet);
+ Int_t chamber = fGeo->GetChamber(iDet);
+ Int_t nRowMax = commonParam->GetRowMax(plane,chamber,sector);
+ Int_t nColMax = commonParam->GetColMax(plane);
// Loop through the pixels of one detector and add the signals
digitsA = fSDigitsManager->GetDigits(iDet);
}
// The next set of s-digits
- mergeSDigitsManager = (AliTRDdigitsManager *) fSDigitsManagerList->After(mergeSDigitsManager);
+ mergeSDigitsManager = (AliTRDdigitsManager *)
+ fSDigitsManagerList->After(mergeSDigitsManager);
}
// Merges the input s-digits and converts them to normal digits
//
- if (!MergeSDigits()) return kFALSE;
+ if (!MergeSDigits()) {
+ return kFALSE;
+ }
return ConvertSDigits();
// Writes out the TRD-digits and the dictionaries
//
- //Write parameters
+ // Write parameters
fRunLoader->CdGAFile();
// Store the digits and the dictionary in the tree
return;
}
- TTree* tree = 0;
+ TTree *tree = 0;
if (fSDigits) {
// If we produce SDigits
SampleTimeStruct(vdrift);
- // indices:
- Int_t r1 = (Int_t)(10*dist);
+ // Indices:
+ Int_t r1 = (Int_t)(10 * dist);
if (r1 < 0) r1 = 0;
if (r1 > 37) r1 = 37;
Int_t r2 = r1 + 1;
const Int_t kz1 = ((Int_t)(100 * z / 2.5));
const Int_t kz2 = kz1 + 1;
- if ((r1 < 0) || (r1 > 37) || (kz1 < 0) || (kz1 > 10)) {
+ if ((r1 < 0) ||
+ (r1 > 37) ||
+ (kz1 < 0) ||
+ (kz1 > 10)) {
AliWarning(Form("Indices out of range: dist=%.2f, z=%.2f, r1=%d, kz1=%d\n"
,dist,z,r1,kz1));
}
- const Float_t ky111 = fTimeStructInfo.fTimeStruct1[r1+38*kz1];
+ const Float_t ky111 = fTimeStruct1[r1+38*kz1];
const Float_t ky221 = ((r2 <= 37) && (kz2 <= 10))
- ? fTimeStructInfo.fTimeStruct1[r2+38*kz2]
- : fTimeStructInfo.fTimeStruct1[37+38*10];
+ ? fTimeStruct1[r2+38*kz2]
+ : fTimeStruct1[37+38*10];
const Float_t ky121 = (kz2 <= 10)
- ? fTimeStructInfo.fTimeStruct1[r1+38*kz2]
- : fTimeStructInfo.fTimeStruct1[r1+38*10];
+ ? fTimeStruct1[r1+38*kz2]
+ : fTimeStruct1[r1+38*10];
const Float_t ky211 = (r2 <= 37)
- ? fTimeStructInfo.fTimeStruct1[r2+38*kz1]
- : fTimeStructInfo.fTimeStruct1[37+38*kz1];
+ ? fTimeStruct1[r2+38*kz1]
+ : fTimeStruct1[37+38*kz1];
// 2D Interpolation, lower drift time map
const Float_t ky11 = (ky211-ky111)*10*dist + ky111 - (ky211-ky111)*r1;
const Float_t ky21 = (ky221-ky121)*10*dist + ky121 - (ky221-ky121)*r1;
- const Float_t ky112 = fTimeStructInfo.fTimeStruct2[r1+38*kz1];
+ const Float_t ky112 = fTimeStruct2[r1+38*kz1];
const Float_t ky222 = ((r2 <= 37) && (kz2 <= 10))
- ? fTimeStructInfo.fTimeStruct2[r2+38*kz2]
- : fTimeStructInfo.fTimeStruct2[37+38*10];
+ ? fTimeStruct2[r2+38*kz2]
+ : fTimeStruct2[37+38*10];
const Float_t ky122 = (kz2 <= 10)
- ? fTimeStructInfo.fTimeStruct2[r1+38*kz2]
- : fTimeStructInfo.fTimeStruct2[r1+38*10];
+ ? fTimeStruct2[r1+38*kz2]
+ : fTimeStruct2[r1+38*10];
const Float_t ky212 = (r2 <= 37)
- ? fTimeStructInfo.fTimeStruct2[r2+38*kz1]
- : fTimeStructInfo.fTimeStruct2[37+38*kz1];
+ ? fTimeStruct2[r2+38*kz1]
+ : fTimeStruct2[37+38*kz1];
// 2D Interpolation, larger drift time map
const Float_t ky12 = (ky212-ky112)*10*dist + ky112 - (ky212-ky112)*r1;
const Float_t ky22 = (ky222-ky122)*10*dist + ky122 - (ky222-ky122)*r1;
- // dist now is the drift distance to the anode wires (negative if electrons are
+ // Dist now is the drift distance to the anode wires (negative if electrons are
// between anode wire plane and cathode pad plane)
dist -= AliTRDgeometry::AmThick() / 2.0;
: 0.0;
// 1D Interpolation between the values at fVDlo and fVDhi
- Float_t a = (ktdrift2 - ktdrift1) / (fTimeStructInfo.fVDhi - fTimeStructInfo.fVDlo);
- Float_t b = ktdrift2 - a * fTimeStructInfo.fVDhi;
+ Float_t a = (ktdrift2 - ktdrift1)
+ / (fVDhi - fVDlo);
+ Float_t b = ktdrift2 - a * fVDhi;
return a * vdrift + b;
// TODO make caching proper, if same timing structure is selected: do not update timestructs!
// Noting to do
- if (vdrift == fTimeStructInfo.fLastVdrift) {
+ if (vdrift == fTimeLastVdrift) {
return;
}
- fTimeStructInfo.fLastVdrift = vdrift;
+ fTimeLastVdrift = vdrift;
// Drift time maps are saved for some drift velocity values (in drift region):
Float_t fVDsmp[8];
{1.48122, 1.48219, 1.48482, 1.48991, 1.50030, 1.53991,
1.52898, 1.52653, 1.53653, 1.57282, 1.82386}};
- if (fTimeStructInfo.fTimeStruct1) delete [] fTimeStructInfo.fTimeStruct1;
- fTimeStructInfo.fTimeStruct1 = new Float_t[ktimebin*kZbin];
-
- if (fTimeStructInfo.fTimeStruct2) delete [] fTimeStructInfo.fTimeStruct2;
- fTimeStructInfo.fTimeStruct2 = new Float_t[ktimebin*kZbin];
-
- for (Int_t ctrt = 0; ctrt<ktimebin; ctrt++) {
- for (Int_t ctrz = 0; ctrz<kZbin; ctrz++) {
- if ( vdrift > fVDsmp[6] ) {
- fTimeStructInfo.fTimeStruct1[ctrt+ctrz*ktimebin] = time2100[ctrt][ctrz];
- fTimeStructInfo.fTimeStruct2[ctrt+ctrz*ktimebin] = time2200[ctrt][ctrz];
- fTimeStructInfo.fVDlo = fVDsmp[6];
- fTimeStructInfo.fVDhi = fVDsmp[7];
- } else if ( vdrift > fVDsmp[5] ) {
- fTimeStructInfo.fTimeStruct1[ctrt+ctrz*ktimebin] = time2000[ctrt][ctrz];
- fTimeStructInfo.fTimeStruct2[ctrt+ctrz*ktimebin] = time2100[ctrt][ctrz];
- fTimeStructInfo.fVDlo = fVDsmp[5];
- fTimeStructInfo.fVDhi = fVDsmp[6];
- } else if ( vdrift > fVDsmp[4] ) {
- fTimeStructInfo.fTimeStruct1[ctrt+ctrz*ktimebin] = time1900[ctrt][ctrz];
- fTimeStructInfo.fTimeStruct2[ctrt+ctrz*ktimebin] = time2000[ctrt][ctrz];
- fTimeStructInfo.fVDlo = fVDsmp[4];
- fTimeStructInfo.fVDhi = fVDsmp[5];
- } else if ( vdrift > fVDsmp[3] ) {
- fTimeStructInfo.fTimeStruct1[ctrt+ctrz*ktimebin] = time1800[ctrt][ctrz];
- fTimeStructInfo.fTimeStruct2[ctrt+ctrz*ktimebin] = time1900[ctrt][ctrz];
- fTimeStructInfo.fVDlo = fVDsmp[3];
- fTimeStructInfo.fVDhi = fVDsmp[4];
- } else if ( vdrift > fVDsmp[2] ) {
- fTimeStructInfo.fTimeStruct1[ctrt+ctrz*ktimebin] = time1700[ctrt][ctrz];
- fTimeStructInfo.fTimeStruct2[ctrt+ctrz*ktimebin] = time1800[ctrt][ctrz];
- fTimeStructInfo.fVDlo = fVDsmp[2];
- fTimeStructInfo.fVDhi = fVDsmp[3];
- } else if ( vdrift > fVDsmp[1] ) {
- fTimeStructInfo.fTimeStruct1[ctrt+ctrz*ktimebin] = time1600[ctrt][ctrz];
- fTimeStructInfo.fTimeStruct2[ctrt+ctrz*ktimebin] = time1700[ctrt][ctrz];
- fTimeStructInfo.fVDlo = fVDsmp[1];
- fTimeStructInfo.fVDhi = fVDsmp[2];
- } else if ( vdrift > (fVDsmp[0] - 1.e-5) ) {
- fTimeStructInfo.fTimeStruct1[ctrt+ctrz*ktimebin] = time1500[ctrt][ctrz];
- fTimeStructInfo.fTimeStruct2[ctrt+ctrz*ktimebin] = time1600[ctrt][ctrz];
- fTimeStructInfo.fVDlo = fVDsmp[0];
- fTimeStructInfo.fVDhi = fVDsmp[1];
+ if (fTimeStruct1) {
+ delete [] fTimeStruct1;
+ }
+ fTimeStruct1 = new Float_t[ktimebin*kZbin];
+
+ if (fTimeStruct2) {
+ delete [] fTimeStruct2;
+ }
+ fTimeStruct2 = new Float_t[ktimebin*kZbin];
+
+ for (Int_t ctrt = 0; ctrt < ktimebin; ctrt++) {
+ for (Int_t ctrz = 0; ctrz < kZbin; ctrz++) {
+ if (vdrift > fVDsmp[6]) {
+ fTimeStruct1[ctrt+ctrz*ktimebin] = time2100[ctrt][ctrz];
+ fTimeStruct2[ctrt+ctrz*ktimebin] = time2200[ctrt][ctrz];
+ fVDlo = fVDsmp[6];
+ fVDhi = fVDsmp[7];
+ }
+ else if (vdrift > fVDsmp[5]) {
+ fTimeStruct1[ctrt+ctrz*ktimebin] = time2000[ctrt][ctrz];
+ fTimeStruct2[ctrt+ctrz*ktimebin] = time2100[ctrt][ctrz];
+ fVDlo = fVDsmp[5];
+ fVDhi = fVDsmp[6];
+ }
+ else if (vdrift > fVDsmp[4]) {
+ fTimeStruct1[ctrt+ctrz*ktimebin] = time1900[ctrt][ctrz];
+ fTimeStruct2[ctrt+ctrz*ktimebin] = time2000[ctrt][ctrz];
+ fVDlo = fVDsmp[4];
+ fVDhi = fVDsmp[5];
+ }
+ else if (vdrift > fVDsmp[3]) {
+ fTimeStruct1[ctrt+ctrz*ktimebin] = time1800[ctrt][ctrz];
+ fTimeStruct2[ctrt+ctrz*ktimebin] = time1900[ctrt][ctrz];
+ fVDlo = fVDsmp[3];
+ fVDhi = fVDsmp[4];
+ }
+ else if (vdrift > fVDsmp[2]) {
+ fTimeStruct1[ctrt+ctrz*ktimebin] = time1700[ctrt][ctrz];
+ fTimeStruct2[ctrt+ctrz*ktimebin] = time1800[ctrt][ctrz];
+ fVDlo = fVDsmp[2];
+ fVDhi = fVDsmp[3];
+ }
+ else if (vdrift > fVDsmp[1]) {
+ fTimeStruct1[ctrt+ctrz*ktimebin] = time1600[ctrt][ctrz];
+ fTimeStruct2[ctrt+ctrz*ktimebin] = time1700[ctrt][ctrz];
+ fVDlo = fVDsmp[1];
+ fVDhi = fVDsmp[2];
+ }
+ else if (vdrift > (fVDsmp[0] - 1.0e-5)) {
+ fTimeStruct1[ctrt+ctrz*ktimebin] = time1500[ctrt][ctrz];
+ fTimeStruct2[ctrt+ctrz*ktimebin] = time1600[ctrt][ctrz];
+ fVDlo = fVDsmp[0];
+ fVDhi = fVDsmp[1];
}
}
}
+
}
//_____________________________________________________________________________
void AliTRDdigitizer::RecalcDiffusion(Float_t vdrift)
{
- if (vdrift == fDiffusionInfo.fLastVdrift)
+ //
+ // Recalculates the diffusion parameters
+ //
+ // The B=0 case is not really included here.
+ // Should be revisited!
+ //
+
+ if (vdrift == fDiffLastVdrift) {
return;
+ }
- AliTRDSimParam* simParam = AliTRDSimParam::Instance();
+ AliTRDSimParam *simParam = AliTRDSimParam::Instance();
if (!simParam) {
AliError("Could not get simulation parameters\n");
return;
}
- AliTRDCommonParam* commonParam = AliTRDCommonParam::Instance();
+ AliTRDCommonParam *commonParam = AliTRDCommonParam::Instance();
if (!commonParam) {
AliError("Could not get common parameters\n");
return;
}
- AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
+ AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
if (!calibration) {
AliError("Could not get calibration object\n");
return;
}
- Float_t field = commonParam->GetField();
- fDiffusionInfo.fLastVdrift = vdrift;
+ // The magnetic field strength
+ Double_t x[3] = { 0.0, 0.0, 0.0 };
+ Double_t b[3];
+ gAlice->Field(x,b); // b[] is in kilo Gauss
+ Float_t field = b[2] * 0.1; // Tesla
+
+ fDiffLastVdrift = vdrift;
// DiffusionL
- {
- const Int_t kNb = 5;
- Float_t p0[kNb] = { 0.007440, 0.007493, 0.007513, 0.007672, 0.007831 };
- Float_t p1[kNb] = { 0.019252, 0.018912, 0.018636, 0.018012, 0.017343 };
- Float_t p2[kNb] = { -0.005042, -0.004926, -0.004867, -0.004650, -0.004424 };
- Float_t p3[kNb] = { 0.000195, 0.000189, 0.000195, 0.000182, 0.000169 };
-
- Int_t ib = ((Int_t) (10 * (field - 0.15)));
- ib = TMath::Max( 0,ib);
- ib = TMath::Min(kNb,ib);
-
- fDiffusionInfo.fDiffusionL = p0[ib]
- + p1[ib] * vdrift
- + p2[ib] * vdrift*vdrift
- + p3[ib] * vdrift*vdrift*vdrift;
- }
+ const Int_t kNbL = 5;
+ Float_t p0L[kNbL] = { 0.007440, 0.007493, 0.007513, 0.007672, 0.007831 };
+ Float_t p1L[kNbL] = { 0.019252, 0.018912, 0.018636, 0.018012, 0.017343 };
+ Float_t p2L[kNbL] = { -0.005042, -0.004926, -0.004867, -0.004650, -0.004424 };
+ Float_t p3L[kNbL] = { 0.000195, 0.000189, 0.000195, 0.000182, 0.000169 };
+
+ Int_t ibL = ((Int_t) (10 * (field - 0.15)));
+ ibL = TMath::Max( 0,ibL);
+ ibL = TMath::Min(kNbL,ibL);
+
+ fDiffusionL = p0L[ibL]
+ + p1L[ibL] * vdrift
+ + p2L[ibL] * vdrift*vdrift
+ + p3L[ibL] * vdrift*vdrift*vdrift;
// DiffusionT
- {
- const Int_t kNb = 5;
- Float_t p0[kNb] = { 0.009550, 0.009599, 0.009674, 0.009757, 0.009850 };
- Float_t p1[kNb] = { 0.006667, 0.006539, 0.006359, 0.006153, 0.005925 };
- Float_t p2[kNb] = { -0.000853, -0.000798, -0.000721, -0.000635, -0.000541 };
- Float_t p3[kNb] = { 0.000131, 0.000122, 0.000111, 0.000098, 0.000085 };
-
- Int_t ib = ((Int_t) (10 * (field - 0.15)));
- ib = TMath::Max( 0,ib);
- ib = TMath::Min(kNb,ib);
-
- fDiffusionInfo.fDiffusionT = p0[ib]
- + p1[ib] * vdrift
- + p2[ib] * vdrift*vdrift
- + p3[ib] * vdrift*vdrift*vdrift;
- }
+ const Int_t kNbT = 5;
+ Float_t p0T[kNbT] = { 0.009550, 0.009599, 0.009674, 0.009757, 0.009850 };
+ Float_t p1T[kNbT] = { 0.006667, 0.006539, 0.006359, 0.006153, 0.005925 };
+ Float_t p2T[kNbT] = { -0.000853, -0.000798, -0.000721, -0.000635, -0.000541 };
+ Float_t p3T[kNbT] = { 0.000131, 0.000122, 0.000111, 0.000098, 0.000085 };
+
+ Int_t ibT= ((Int_t) (10 * (field - 0.15)));
+ ibT = TMath::Max( 0,ibT);
+ ibT = TMath::Min(kNbT,ibT);
+
+ fDiffusionT = p0T[ibT]
+ + p1T[ibT] * vdrift
+ + p2T[ibT] * vdrift*vdrift
+ + p3T[ibT] * vdrift*vdrift*vdrift;
// OmegaTau
- fDiffusionInfo.fOmegaTau = calibration->GetOmegaTau(vdrift);
-
+ fOmegaTau = calibration->GetOmegaTau(vdrift,field);
+
// Lorentzfactor
- {
- if (commonParam->ExBOn()) {
- fDiffusionInfo.fLorentzFactor = 1.0 / (1.0 + fDiffusionInfo.fOmegaTau*fDiffusionInfo.fOmegaTau);
- }
- else {
- fDiffusionInfo.fLorentzFactor = 1.0;
- }
+ if (commonParam->ExBOn()) {
+ fLorentzFactor = 1.0 / (1.0 + fOmegaTau*fOmegaTau);
+ }
+ else {
+ fLorentzFactor = 1.0;
}
}
//
RecalcDiffusion(vdrift);
- return fDiffusionInfo.fDiffusionL;
+
+ return fDiffusionL;
}
//
RecalcDiffusion(vdrift);
- return fDiffusionInfo.fDiffusionT;
+
+ return fDiffusionT;
}
RecalcDiffusion(vdrift);
Float_t driftSqrt = TMath::Sqrt(driftlength);
- Float_t sigmaT = driftSqrt * fDiffusionInfo.fDiffusionT;
- Float_t sigmaL = driftSqrt * fDiffusionInfo.fDiffusionL;
- xyz[0] = gRandom->Gaus(xyz[0], sigmaL * GetLorentzFactor(vdrift));
- xyz[1] = gRandom->Gaus(xyz[1], sigmaT * GetLorentzFactor(vdrift));
- xyz[2] = gRandom->Gaus(xyz[2], sigmaT);
+ Float_t sigmaT = driftSqrt * fDiffusionT;
+ Float_t sigmaL = driftSqrt * fDiffusionL;
+ xyz[0] = gRandom->Gaus(xyz[0],sigmaL * GetLorentzFactor(vdrift));
+ xyz[1] = gRandom->Gaus(xyz[1],sigmaT * GetLorentzFactor(vdrift));
+ xyz[2] = gRandom->Gaus(xyz[2],sigmaT);
return 1;
//
RecalcDiffusion(vd);
- return fDiffusionInfo.fLorentzFactor;
+
+ return fLorentzFactor;
}
RecalcDiffusion(vdrift);
xyz[0] = xyz[0];
- xyz[1] = xyz[1] + fDiffusionInfo.fOmegaTau * driftlength;
+ xyz[1] = xyz[1] + fOmegaTau * driftlength;
xyz[2] = xyz[2];
return 1;
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff