/* $Id$ */
-///////////////////////////////////////////////////////////////////////////////
-// //
-// Creates and handles digits from TRD hits //
-// Author: C. Blume (C.Blume@gsi.de) //
-// //
-// The following effects are included: //
-// - Diffusion //
-// - ExB effects //
-// - Gas gain including fluctuations //
-// - Pad-response (simple Gaussian approximation) //
-// - Time-response //
-// - Electronics noise //
-// - Electronics gain //
-// - Digitization //
-// - ADC threshold //
-// The corresponding parameter can be adjusted via the various //
-// Set-functions. If these parameters are not explicitly set, default //
-// values are used (see Init-function). //
-// As an example on how to use this class to produce digits from hits //
-// have a look at the macro hits2digits.C //
-// The production of summable digits is demonstrated in hits2sdigits.C //
-// and the subsequent conversion of the s-digits into normal digits is //
-// explained in sdigits2digits.C. //
-// //
-///////////////////////////////////////////////////////////////////////////////
-
-#include <stdlib.h>
+////////////////////////////////////////////////////////////////////////////
+// //
+// Creates and handles digits from TRD hits //
+// //
+// Authors: C. Blume (blume@ikf.uni-frankfurt.de) //
+// C. Lippmann //
+// B. Vulpescu //
+// //
+// The following effects are included: //
+// - Diffusion //
+// - ExB effects //
+// - Gas gain including fluctuations //
+// - Pad-response (simple Gaussian approximation) //
+// - Time-response //
+// - Electronics noise //
+// - Electronics gain //
+// - Digitization //
+// //
+////////////////////////////////////////////////////////////////////////////
#include <TMath.h>
#include <TVector.h>
#include <TF1.h>
#include <TList.h>
#include <TTask.h>
+#include <TGeoManager.h>
#include "AliRun.h"
#include "AliRunLoader.h"
#include "AliRunDigitizer.h"
#include "AliRunLoader.h"
#include "AliLoader.h"
+#include "AliLog.h"
#include "AliTRD.h"
#include "AliTRDhit.h"
#include "AliTRDdigitizer.h"
#include "AliTRDdataArrayI.h"
+#include "AliTRDdataArrayS.h"
#include "AliTRDdataArrayF.h"
#include "AliTRDsegmentArray.h"
#include "AliTRDdigitsManager.h"
#include "AliTRDgeometry.h"
-#include "AliTRDparameter.h"
#include "AliTRDpadPlane.h"
#include "AliTRDcalibDB.h"
#include "AliTRDSimParam.h"
#include "AliTRDCommonParam.h"
+#include "AliTRDfeeParam.h"
+
+#include "Cal/AliTRDCalROC.h"
+#include "Cal/AliTRDCalDet.h"
ClassImp(AliTRDdigitizer)
//_____________________________________________________________________________
AliTRDdigitizer::AliTRDdigitizer()
+ :AliDigitizer()
+ ,fRunLoader(0)
+ ,fDigitsManager(0)
+ ,fSDigitsManager(0)
+ ,fSDigitsManagerList(0)
+ ,fTRD(0)
+ ,fGeo(0)
+ ,fEvent(0)
+ ,fMasks(0)
+ ,fCompress(kTRUE)
+ ,fSDigits(kFALSE)
+ ,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;
- fPar = 0;
- fEvent = 0;
- fMasks = 0;
- fCompress = kTRUE;
- fDebug = 0;
- fSDigits = kFALSE;
- fSDigitsScale = 0.0;
- fMergeSignalOnly = kFALSE;
- fSimpleSim = kFALSE;
- fSimpleDet = 0;
-
- 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)
+ ,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
//
Init();
+
}
//_____________________________________________________________________________
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)
+ ,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
//
Init();
+
}
//_____________________________________________________________________________
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)
+ ,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
//
Init();
+
}
//_____________________________________________________________________________
Bool_t AliTRDdigitizer::Init()
{
- fRunLoader = 0;
+ //
+ // Initialize the digitizer with default values
+ //
- //NewIO: These data members probably are not needed anymore
+ fRunLoader = 0;
fDigitsManager = 0;
fSDigitsManager = 0;
fSDigitsManagerList = 0;
fTRD = 0;
fGeo = 0;
- fPar = 0;
-
- //End NewIO comment
+
fEvent = 0;
fMasks = 0;
fCompress = kTRUE;
- fDebug = 0;
fSDigits = kFALSE;
- fSDigitsScale = 100.; // For the summable digits
fMergeSignalOnly = kFALSE;
- fSimpleSim = kFALSE;
- fSimpleDet = 0;
- 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)
+ ,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();
if (fMasks) {
delete [] fMasks;
- fMasks = 0;
+ 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 (fGeo) {
+ delete fGeo;
+ fGeo = 0;
+ }
+
}
//_____________________________________________________________________________
// Assignment operator
//
- if (this != &d) ((AliTRDdigitizer &) d).Copy(*this);
+ if (this != &d) {
+ ((AliTRDdigitizer &) d).Copy(*this);
+ }
+
return *this;
}
((AliTRDdigitizer &) d).fSDigitsManagerList = 0;
((AliTRDdigitizer &) d).fTRD = 0;
((AliTRDdigitizer &) d).fGeo = 0;
- ((AliTRDdigitizer &) d).fPar = 0;
((AliTRDdigitizer &) d).fEvent = 0;
((AliTRDdigitizer &) d).fMasks = 0;
((AliTRDdigitizer &) d).fCompress = fCompress;
- ((AliTRDdigitizer &) d).fDebug = fDebug ;
((AliTRDdigitizer &) d).fSDigits = fSDigits;
- ((AliTRDdigitizer &) d).fSDigitsScale = fSDigitsScale;
((AliTRDdigitizer &) d).fMergeSignalOnly = fMergeSignalOnly;
- ((AliTRDdigitizer &) d).fSimpleSim = fSimpleSim;
- ((AliTRDdigitizer &) d).fSimpleDet = fSimpleDet;
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;
+ // Do not copy timestructs, just invalidate lastvdrift.
+ // Next time they are requested, they get recalculated
+ if (target.fTimeStruct1) {
+ delete [] target.fTimeStruct1;
+ target.fTimeStruct1 = 0;
}
-
- target.fTimeStructInfo.fLastVdrift = -1;
+ if (target.fTimeStruct2) {
+ delete [] target.fTimeStruct2;
+ target.fTimeStruct2 = 0;
+ }
+ target.fTimeLastVdrift = -1;
+
}
//_____________________________________________________________________________
-void AliTRDdigitizer::Exec(Option_t* option)
+void AliTRDdigitizer::Exec(Option_t *option)
{
//
// Executes the merging
TString optionString = option;
if (optionString.Contains("deb")) {
- fDebug = 1;
- if (optionString.Contains("2")) {
- fDebug = 2;
- }
- printf("<AliTRDdigitizer::Exec> ");
- printf("Called with debug option %d\n",fDebug);
+ AliLog::SetClassDebugLevel("AliTRDdigitizer",1);
+ AliInfo("Called with debug option");
}
// The AliRoot file is already connected by the manager
- AliRunLoader* inrl;
+ AliRunLoader *inrl = 0x0;
- if (gAlice)
- {
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::Exec> ");
- printf("AliRun object found on file.\n");
- }
- }
+ if (gAlice) {
+ AliDebug(1,"AliRun object found on file.");
+ }
else {
inrl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(0));
inrl->LoadgAlice();
gAlice = inrl->GetAliRun();
- if (!gAlice)
- {
- printf("<AliTRDdigitizer::Exec> ");
- printf("Could not find AliRun object.\n");
- return;
- }
+ if (!gAlice) {
+ AliError("Could not find AliRun object.")
+ return;
+ }
}
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");
- TTree* tree = 0;
- if (fSDigits)
- {
- //if we produce SDigits
+ AliLoader *ogime = orl->GetLoader("TRDLoader");
+
+ TTree *tree = 0;
+ if (fSDigits) {
+ // If we produce SDigits
+ tree = ogime->TreeS();
+ if (!tree) {
+ ogime->MakeTree("S");
tree = ogime->TreeS();
- if (!tree)
- {
- ogime->MakeTree("S");
- tree = ogime->TreeS();
- }
}
- else
- {//if we produce Digits
- tree = ogime->TreeD();
- if (!tree)
- {
- ogime->MakeTree("D");
- tree = ogime->TreeD();
- }
+ }
+ else {
+ // If we produce Digits
+ tree = ogime->TreeD();
+ if (!tree) {
+ ogime->MakeTree("D");
+ tree = ogime->TreeD();
}
+ }
+
MakeBranch(tree);
+
}
for (iInput = 0; iInput < nInput; iInput++) {
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::Exec> ");
- printf("Add input stream %d\n",iInput);
- }
+ AliDebug(1,Form("Add input stream %d",iInput));
- // check if the input tree exists
+ // Check if the input tree exists
inrl = AliRunLoader::GetRunLoader(fManager->GetInputFolderName(iInput));
- AliLoader* gime = inrl->GetLoader("TRDLoader");
-
- TTree * treees = gime->TreeS();
- if (treees == 0x0)
- {
- if (gime->LoadSDigits())
- {
- Error("Exec","Error Occured while loading S. Digits for input %d.",iInput);
- return;
- }
- treees = gime->TreeS();
- }
+ AliLoader *gime = inrl->GetLoader("TRDLoader");
+
+ 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();
+ }
if (treees == 0x0) {
- printf("<AliTRDdigitizer::Exec> ");
- printf("Input stream %d does not exist\n",iInput);
+ AliError(Form("Input stream %d does not exist",iInput));
return;
}
// Read the s-digits via digits manager
sdigitsManager = new AliTRDdigitsManager();
- sdigitsManager->SetDebug(fDebug);
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
}
// Convert the s-digits to normal digits
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::Exec> ");
- printf("Do the conversion\n");
- }
+ AliDebug(1,"Do the conversion");
SDigits2Digits();
// Store the digits
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::Exec> ");
- printf("Write the digits\n");
- }
-
+ AliDebug(1,"Write the digits");
fDigitsManager->WriteDigits();
- //Write parameters
+ // Write parameters
orl->CdGAFile();
- if (!gFile->Get("TRDparameter")) GetParameter()->Write();
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::Exec> ");
- printf("Done\n");
- }
+ AliDebug(1,"Done");
DeleteSDigitsManager();
//
// Opens a ROOT-file with TRD-hits and reads in the hit-tree
//
-
// Connect the AliRoot file containing Geometry, Kine, and Hits
-
+ //
TString evfoldname = AliConfig::GetDefaultEventFolderName();
+
fRunLoader = AliRunLoader::GetRunLoader(evfoldname);
- if (!fRunLoader)
- fRunLoader = AliRunLoader::Open(file,AliConfig::GetDefaultEventFolderName(),
- "UPDATE");
-
- if (!fRunLoader)
- {
- Error("Open","Can not open session for file %s.",file);
- return kFALSE;
- }
+ if (!fRunLoader) {
+ fRunLoader = AliRunLoader::Open(file,evfoldname,"UPDATE");
+ }
+ if (!fRunLoader) {
+ AliError(Form("Can not open session for file %s.",file));
+ return kFALSE;
+ }
- if (!fRunLoader->GetAliRun()) fRunLoader->LoadgAlice();
+ if (!fRunLoader->GetAliRun()) {
+ fRunLoader->LoadgAlice();
+ }
gAlice = fRunLoader->GetAliRun();
if (gAlice) {
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::Open> ");
- printf("AliRun object found on file.\n");
- }
+ AliDebug(1,"AliRun object found on file.");
}
else {
- printf("<AliTRDdigitizer::Open> ");
- printf("Could not find AliRun object.\n");
+ AliError("Could not find AliRun object.");
return kFALSE;
}
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 (!loader)
- {
- Error("Open","Can not get TRD loader from Run Loader");
- return kFALSE;
- }
+ 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.");
+ }
+ else {
+ AliError("Could not find AliRun object.");
+ 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;
- if (fSDigits)
- {
- //if we produce SDigits
- tree = loader->TreeS();
- if (!tree)
- {
- loader->MakeTree("S");
- tree = loader->TreeS();
- }
- }
- else
- {//if we produce Digits
- if (!tree)
- {
- loader->MakeTree("D");
- tree = loader->TreeD();
- }
- }
+ 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 {
// Get the pointer to the detector class and check for version 1
fTRD = (AliTRD *) gAlice->GetDetector("TRD");
if (!fTRD) {
- printf("<AliTRDdigitizer::InitDetector> ");
- printf("No TRD module found\n");
+ AliFatal("No TRD module found");
exit(1);
}
if (fTRD->IsVersion() != 1) {
- printf("<AliTRDdigitizer::InitDetector> ");
- printf("TRD must be version 1 (slow simulator).\n");
+ AliFatal("TRD must be version 1 (slow simulator)");
exit(1);
}
// Get the geometry
- fGeo = fTRD->GetGeometry();
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::InitDetector> ");
- printf("Geometry version %d\n",fGeo->IsVersion());
- }
+ fGeo = new AliTRDgeometry();
// Create a digits manager
- delete fDigitsManager;
+ if (fDigitsManager) {
+ delete fDigitsManager;
+ }
fDigitsManager = new AliTRDdigitsManager();
fDigitsManager->SetSDigits(fSDigits);
fDigitsManager->CreateArrays();
fDigitsManager->SetEvent(fEvent);
- fDigitsManager->SetDebug(fDebug);
// The list for the input s-digits manager to be merged
if (fSDigitsManagerList) {
fSDigitsManagerList->Delete();
- } else {
+ }
+ else {
fSDigitsManagerList = new TList();
}
}
//_____________________________________________________________________________
-Bool_t AliTRDdigitizer::MakeBranch(TTree* tree) const
+Bool_t AliTRDdigitizer::MakeBranch(TTree *tree) const
{
//
// Create the branches for the digits array
}
//_____________________________________________________________________________
-Bool_t AliTRDdigitizer::MakeDigits()
+void AliTRDdigitizer::AddSDigitsManager(AliTRDdigitsManager *man)
{
//
- // Creates digits.
+ // Add a digits manager for s-digits to the input list.
//
- ///////////////////////////////////////////////////////////////
- // Parameter
- ///////////////////////////////////////////////////////////////
-
- // Converts number of electrons to fC
- const Double_t kEl2fC = 1.602E-19 * 1.0E15;
-
- ///////////////////////////////////////////////////////////////
-
- // Number of pads included in the pad response
- const Int_t kNpad = 3;
-
- // Number of track dictionary arrays
- const Int_t kNDict = AliTRDdigitsManager::kNDict;
+ fSDigitsManagerList->Add(man);
- // Half the width of the amplification region
- const Float_t kAmWidth = AliTRDgeometry::AmThick() / 2.;
- // Width of the drit region
- const Float_t kDrWidth = AliTRDgeometry::DrThick();
-
- Int_t iRow, iCol, iTime, iPad;
- Int_t iDict = 0;
- Int_t nBytes = 0;
+}
- Int_t totalSizeDigits = 0;
- Int_t totalSizeDict0 = 0;
- Int_t totalSizeDict1 = 0;
- Int_t totalSizeDict2 = 0;
+//_____________________________________________________________________________
+void AliTRDdigitizer::DeleteSDigitsManager()
+{
+ //
+ // Removes digits manager from the input list.
+ //
- Int_t timeBinTRFend = 1;
+ fSDigitsManagerList->Delete();
- Double_t pos[3];
- Double_t rot[3];
- Double_t xyz[3];
- Double_t padSignal[kNpad];
- Double_t signalOld[kNpad];
+}
- AliTRDdataArrayF *signals = 0;
- AliTRDdataArrayI *digits = 0;
- AliTRDdataArrayI *dictionary[kNDict];
+//_____________________________________________________________________________
+Bool_t AliTRDdigitizer::MakeDigits()
+{
+ //
+ // Creates digits.
+ //
- AliTRDpadPlane *padPlane = 0;
+ AliDebug(1,"Start creating digits");
- // Create a default parameter class if none is defined
- if (!fPar) {
- fPar = new AliTRDparameter("TRDparameter","Standard TRD parameter");
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Create the default parameter object\n");
- }
- }
-
- AliTRDSimParam* simParam = AliTRDSimParam::Instance();
- if (!simParam)
- {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Could not get simulation params\n");
- return kFALSE;
- }
-
- AliTRDCommonParam* commonParam = AliTRDCommonParam::Instance();
- if (!commonParam)
- {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Could not get common params\n");
+ if (!fGeo) {
+ AliError("No geometry defined");
return kFALSE;
}
-
- // Create a container for the amplitudes
- AliTRDsegmentArray *signalsArray
- = new AliTRDsegmentArray("AliTRDdataArrayF"
- ,AliTRDgeometry::Ndet());
-
- AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
- if (!calibration)
- {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Could not get calibration object\n");
+
+ AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
+ if (!calibration) {
+ AliFatal("Could not get calibration object");
return kFALSE;
}
- if (simParam->TRFOn()) {
- timeBinTRFend = ((Int_t) ( simParam->GetTRFhi() * calibration->GetSamplingFrequency())) - 1;
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Sample the TRF up to bin %d\n",timeBinTRFend);
- }
- }
+ const Int_t kNdet = AliTRDgeometry::Ndet();
- Float_t elAttachProp = simParam->GetElAttachProp() / 100.;
+ Float_t **hits = new Float_t*[kNdet];
+ Int_t *nhit = new Int_t[kNdet];
- if (!fGeo) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("No geometry defined\n");
+ AliTRDdataArrayF *signals = 0x0;
+
+ // Sort all hits according to detector number
+ if (!SortHits(hits,nhit)) {
+ AliError("Sorting hits failed");
return kFALSE;
}
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Start creating digits.\n");
+ // Loop through all detectors
+ for (Int_t det = 0; det < kNdet; det++) {
+
+ // Detectors that are switched off, not installed, etc.
+ if (( calibration->IsChamberInstalled(det)) &&
+ (!calibration->IsChamberMasked(det)) &&
+ ( fGeo->ChamberInGeometry(det)) &&
+ (nhit[det] > 0)) {
+
+ signals = new AliTRDdataArrayF();
+
+ // 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));
+ 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));
+ return kFALSE;
+ }
+
+ // Delete the signals array
+ delete signals;
+ signals = 0x0;
+
+ } // if: detector status
+
+ delete [] hits[det];
+
+ } // for: detector
+
+ delete [] hits;
+ delete [] nhit;
+
+ return kTRUE;
+
+}
+
+//_____________________________________________________________________________
+Bool_t AliTRDdigitizer::SortHits(Float_t **hits, Int_t *nhit)
+{
+ //
+ // Read all the hits and sorts them according to detector number
+ // in the output array <hits>.
+ //
+
+ AliDebug(1,"Start sorting hits");
+
+ const Int_t kNdet = AliTRDgeometry::Ndet();
+ // Size of the hit vector
+ const Int_t kNhit = 6;
+
+ Float_t *xyz = 0;
+ Int_t nhitTrk = 0;
+
+ Int_t *lhit = new Int_t[kNdet];
+
+ for (Int_t det = 0; det < kNdet; det++) {
+ lhit[det] = 0;
+ nhit[det] = 0;
+ hits[det] = 0;
}
- AliLoader* gimme = fRunLoader->GetLoader("TRDLoader");
- if (!gimme->TreeH()) gimme->LoadHits();
- TTree* hitTree = gimme->TreeH();
- if (hitTree == 0x0)
- {
- Error("MakeDigits","Can not get TreeH");
- return kFALSE;
- }
+ AliLoader *gimme = fRunLoader->GetLoader("TRDLoader");
+ if (!gimme->TreeH()) {
+ gimme->LoadHits();
+ }
+ TTree *hitTree = gimme->TreeH();
+ if (hitTree == 0x0) {
+ AliError("Can not get TreeH");
+ return kFALSE;
+ }
fTRD->SetTreeAddress();
-
+
// Get the number of entries in the hit tree
// (Number of primary particles creating a hit somewhere)
- Int_t nTrack = 1;
- if (!fSimpleSim) {
- nTrack = (Int_t) hitTree->GetEntries();
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Found %d primary particles\n",nTrack);
- }
- }
+ Int_t nTrk = (Int_t) hitTree->GetEntries();
+ AliDebug(1,Form("Found %d tracks",nTrk));
- Int_t detectorOld = -1;
- Int_t countHits = 0;
-
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MakeDigits> Sampling = %.0fMHz\n", calibration->GetSamplingFrequency());
- printf("<AliTRDdigitizer::MakeDigits> Gain = %d\n",(Int_t)simParam->GetGasGain());
- printf("<AliTRDdigitizer::MakeDigits> Noise = %d\n",(Int_t)simParam->GetNoise());
- if (simParam->TimeStructOn()) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Time Structure of drift cells implemented.\n");
- } else {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Constant drift velocity in drift cells.\n");
- }
- }
-
- Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
- Float_t samplingRate = calibration->GetSamplingFrequency();
+ // Loop through all the tracks in the tree
+ for (Int_t iTrk = 0; iTrk < nTrk; iTrk++) {
- // Loop through all entries in the tree
- for (Int_t iTrack = 0; iTrack < nTrack; iTrack++) {
+ gAlice->ResetHits();
+ hitTree->GetEvent(iTrk);
- if (!fSimpleSim) {
- gAlice->ResetHits();
- nBytes += hitTree->GetEvent(iTrack);
+ if (!fTRD->Hits()) {
+ AliError(Form("No hits array for track = %d",iTrk));
+ continue;
}
+ // Number of hits for this track
+ nhitTrk = fTRD->Hits()->GetEntriesFast();
+
+ Int_t hitCnt = 0;
// Loop through the TRD hits
- Int_t iHit = 0;
AliTRDhit *hit = (AliTRDhit *) fTRD->FirstHit(-1);
while (hit) {
-
- 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 sector = fGeo->GetSector(detector);
- Int_t chamber = fGeo->GetChamber(detector);
- Float_t time0 = AliTRDgeometry::GetTime0(plane);
-
- padPlane = commonParam->GetPadPlane(plane,chamber);
- Float_t row0 = padPlane->GetRow0();
- Float_t col0 = padPlane->GetCol0();
- Int_t nRowMax = padPlane->GetNrows();
- Int_t nColMax = padPlane->GetNcols();
-
- if (fDebug > 1) {
- printf("Analyze hit no. %d ",iHit);
- printf("-----------------------------------------------------------\n");
- hit->Dump();
- printf("plane = %d, sector = %d, chamber = %d\n"
- ,plane,sector,chamber);
- printf("nRowMax = %d, nColMax = %d\n"
- ,nRowMax,nColMax);
- printf("nTimeTotal = %d\n"
- ,nTimeTotal);
- printf("row0 = %f, col0 = %f, time0 = %f\n"
- ,row0,col0,time0);
- printf("samplingRate = %f\n"
- ,samplingRate);
- }
-
- // Don't analyze test hits and switched off detectors
- if ((CheckDetector(plane,chamber,sector)) &&
- (((Int_t) q) != 0)) {
- if (detector != detectorOld) {
-
- if (fDebug > 1) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Get new container. New det = %d, Old det = %d\n"
- ,detector,detectorOld);
- }
- // Compress the old one if enabled
- if ((fCompress) && (detectorOld > -1)) {
- if (fDebug > 1) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Compress the old container ...");
- }
- signals->Compress(1,0);
- for (iDict = 0; iDict < kNDict; iDict++) {
- dictionary[iDict]->Compress(1,0);
- }
- if (fDebug > 1) printf("done\n");
- }
- // Get the new container
- signals = (AliTRDdataArrayF *) signalsArray->At(detector);
- if (signals->GetNtime() == 0) {
- // Allocate a new one if not yet existing
- if (fDebug > 1) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Allocate a new container ... ");
- }
- signals->Allocate(nRowMax,nColMax,nTimeTotal);
- }
- else if (fSimpleSim) {
- // Clear an old one for the simple simulation
- if (fDebug > 1) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Clear a old container ... ");
- }
- signals->Clear();
- }
- else {
- // Expand an existing one
- if (fCompress) {
- if (fDebug > 1) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Expand an existing container ... ");
- }
- signals->Expand();
- }
+ hitCnt++;
+
+ // Don't analyze test hits
+ if (((Int_t) hit->GetCharge()) != 0) {
+
+ Int_t trk = hit->Track();
+ Int_t det = hit->GetDetector();
+ Int_t q = hit->GetCharge();
+ Float_t x = hit->X();
+ Float_t y = hit->Y();
+ Float_t z = hit->Z();
+ Float_t time = hit->GetTime();
+
+ if (nhit[det] == lhit[det]) {
+ // Inititialization of new detector
+ xyz = new Float_t[kNhit*(nhitTrk+lhit[det])];
+ if (hits[det]) {
+ memcpy(xyz,hits[det],sizeof(Float_t)*kNhit*lhit[det]);
+ delete [] hits[det];
}
- // The same for the dictionary
- if (!fSimpleSim) {
- 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();
- }
- }
- }
- if (fDebug > 1) printf("done\n");
- detectorOld = detector;
- }
-
- // Rotate the sectors on top of each other
- if (fSimpleSim) {
- rot[0] = pos[0];
- rot[1] = pos[1];
- rot[2] = pos[2];
- }
+ lhit[det] += nhitTrk;
+ hits[det] = xyz;
+ }
else {
- fGeo->Rotate(detector,pos,rot);
+ xyz = hits[det];
}
+ xyz[nhit[det]*kNhit+0] = x;
+ xyz[nhit[det]*kNhit+1] = y;
+ xyz[nhit[det]*kNhit+2] = z;
+ xyz[nhit[det]*kNhit+3] = q;
+ xyz[nhit[det]*kNhit+4] = trk;
+ xyz[nhit[det]*kNhit+5] = time;
+ nhit[det]++;
- // 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) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Hit outside of sensitive volume, row (z=%f, row0=%f, rowE=%f)\n"
- ,xyz[2],padPlane->GetRow0(),padPlane->GetRowEnd());
- }
- continue;
- }
- Float_t tt = driftlength + kAmWidth;
- if (tt < 0.0 || tt > kDrWidth + 2.*kAmWidth) {
- if (iEl == 0) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("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]);
-
- // The pad column (rphi-direction)
- Float_t offsetTilt = padPlane->GetTiltOffset(rowOffset); // MI change
- 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);
-
- // 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;
- }
-
- // Apply the diffusion smearing
- if (simParam->DiffusionOn()) {
- if (!(Diffusion(driftvelocity, absdriftlength,xyz))) continue;
- }
+ } // if: charge != 0
- // Apply E x B effects (depends on drift direction)
- if (commonParam->ExBOn()) {
- if (!(ExB(driftvelocity, driftlength,xyz))) continue;
- }
+ hit = (AliTRDhit *) fTRD->NextHit();
- // 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); // MI change
- 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);
-
- // 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 = xyz[2] - row0 + simParam->GetAnodeWireOffset();
- Double_t Z = row0 - xyz[2] + simParam->GetAnodeWireOffset();
- Z -= ((Int_t)(2*Z))/2.;
- 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;
- }
+ } // for: hits of one track
- // 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 / padPlane->GetColSize(colE);
- 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;
- }
+ } // for: tracks
- // The time bin (always positive), with t0 correction
- Double_t timeBinIdeal = drifttime * samplingRate + t0;
- 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);
- }
-
- signalOld[0] = 0.0;
- signalOld[1] = 0.0;
- signalOld[2] = 0.0;
-
- for (iPad = 0; iPad < kNpad; iPad++) {
+ delete [] lhit;
- Int_t colPos = colE + iPad - 1;
- if (colPos < 0) continue;
- if (colPos >= nColMax) break;
+ return kTRUE;
- // 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) && (!fSimpleSim)) {
- 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
+//_____________________________________________________________________________
+Bool_t AliTRDdigitizer::ConvertHits(Int_t det, Float_t *hits, Int_t nhit
+ , AliTRDdataArrayF *signals)
+{
+ //
+ // Converts the detectorwise sorted hits to detector signals
+ //
- } // Loop: time bins
+ AliDebug(1,Form("Start converting hits for detector=%d (nhits=%d)",det,nhit));
- } // Loop: electrons of a single hit
+ // Number of pads included in the pad response
+ const Int_t kNpad = 3;
+ // Number of track dictionary arrays
+ const Int_t kNdict = AliTRDdigitsManager::kNDict;
+ // Size of the hit vector
+ const Int_t kNhit = 6;
- } // If: detector and test hit
+ // Width of the amplification region
+ const Float_t kAmWidth = AliTRDgeometry::AmThick();
+ // Width of the drift region
+ const Float_t kDrWidth = AliTRDgeometry::DrThick();
+ // Drift + amplification region
+ const Float_t kDrMin = - 0.5 * kAmWidth;
+ const Float_t kDrMax = kDrWidth + 0.5 * kAmWidth;
+
+ Int_t iPad = 0;
+ Int_t dict = 0;
+ Int_t timeBinTRFend = 1;
- hit = (AliTRDhit *) fTRD->NextHit();
+ Double_t pos[3];
+ Double_t loc[3];
+ Double_t padSignal[kNpad];
+ Double_t signalOld[kNpad];
- } // Loop: hits of one primary track
+ AliTRDdataArrayI *dictionary[kNdict];
- } // Loop: primary tracks
+ AliTRDSimParam *simParam = AliTRDSimParam::Instance();
+ AliTRDCommonParam *commonParam = AliTRDCommonParam::Instance();
+ AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Finished analyzing %d hits\n",countHits);
+ if (!commonParam) {
+ AliFatal("Could not get common parameterss");
+ return kFALSE;
+ }
+ if (!simParam) {
+ AliFatal("Could not get simulation parameters");
+ return kFALSE;
+ }
+ if (!calibration) {
+ AliFatal("Could not get calibration object");
+ return kFALSE;
}
- // The coupling factor
- Double_t coupling = simParam->GetPadCoupling()
- * simParam->GetTimeCoupling();
-
- // The conversion factor
- Double_t convert = kEl2fC
- * simParam->GetChipGain();
+ // Get the detector wise calibration objects
+ AliTRDCalROC *calVdriftROC = 0;
+ Float_t calVdriftDetValue = 0.0;
+ const AliTRDCalDet *calVdriftDet = calibration->GetVdriftDet();
+ AliTRDCalROC *calT0ROC = 0;
+ Float_t calT0DetValue = 0.0;
+ const AliTRDCalDet *calT0Det = calibration->GetT0Det();
- // Loop through all chambers to finalize the digits
- Int_t iDetBeg = 0;
- Int_t iDetEnd = AliTRDgeometry::Ndet();
- if (fSimpleSim) {
- iDetBeg = fSimpleDet;
- iDetEnd = iDetBeg + 1;
+ if (simParam->TRFOn()) {
+ timeBinTRFend = ((Int_t) (simParam->GetTRFhi()
+ * commonParam->GetSamplingFrequency())) - 1;
}
- 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);
+ Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
+ Float_t samplingRate = commonParam->GetSamplingFrequency();
+ Float_t elAttachProp = simParam->GetElAttachProp() / 100.0;
+
+ AliTRDpadPlane *padPlane = fGeo->GetPadPlane(det);
+ Int_t layer = fGeo->GetLayer(det);
+ Float_t row0 = padPlane->GetRow0ROC();
+ Int_t nRowMax = padPlane->GetNrows();
+ Int_t nColMax = padPlane->GetNcols();
+
+ // Create a new array for the signals
+ signals->Allocate(nRowMax,nColMax,nTimeTotal);
+
+ // Create a new array for the dictionary
+ for (dict = 0; dict < kNdict; dict++) {
+ dictionary[dict] = (AliTRDdataArrayI *) fDigitsManager->GetDictionary(det,dict);
+ dictionary[dict]->Allocate(nRowMax,nColMax,nTimeTotal);
+ }
+
+ // Loop through the hits in this detector
+ for (Int_t hit = 0; hit < nhit; hit++) {
+
+ pos[0] = hits[hit*kNhit+0];
+ pos[1] = hits[hit*kNhit+1];
+ pos[2] = hits[hit*kNhit+2];
+ Float_t q = hits[hit*kNhit+3];
+ Float_t hittime = hits[hit*kNhit+5];
+ Int_t track = ((Int_t) hits[hit*kNhit+4]);
+
+ Int_t inDrift = 1;
+
+ // Find the current volume with the geo manager
+ gGeoManager->SetCurrentPoint(pos);
+ gGeoManager->FindNode();
+ if (strstr(gGeoManager->GetPath(),"/UK")) {
+ inDrift = 0;
+ }
- Double_t *inADC = new Double_t[nTimeTotal];
- Double_t *outADC = new Double_t[nTimeTotal];
+ // Get the calibration objects
+ calVdriftROC = calibration->GetVdriftROC(det);
+ calVdriftDetValue = calVdriftDet->GetValue(det);
+ calT0ROC = calibration->GetT0ROC(det);
+ calT0DetValue = calT0Det->GetValue(det);
+
+ // Go to the local coordinate system:
+ // loc[0] - col direction in amplification or driftvolume
+ // loc[1] - row direction in amplification or driftvolume
+ // loc[2] - time direction in amplification or driftvolume
+ gGeoManager->MasterToLocal(pos,loc);
+ if (inDrift) {
+ // Relative to middle of amplification region
+ loc[2] = loc[2] - kDrWidth/2.0 - kAmWidth/2.0;
+ }
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Digitization for chamber %d\n",iDet);
+ // The driftlength [cm] (w/o diffusion yet !).
+ // It is negative if the hit is between pad plane and anode wires.
+ Double_t driftlength = -1.0 * loc[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 ((loc[1] < padPlane->GetRowEndROC()) ||
+ (loc[1] > padPlane->GetRow0ROC())) {
+ continue;
+ }
+ if ((driftlength < kDrMin) ||
+ (driftlength > kDrMax)) {
+ continue;
+ }
}
- // Add a container for the digits of this detector
- digits = fDigitsManager->GetDigits(iDet);
- // Allocate memory space for the digits buffer
- if (digits->GetNtime() == 0) {
- digits->Allocate(nRowMax,nColMax,nTimeTotal);
- }
- else if (fSimpleSim) {
- digits->Clear();
- }
-
- // Get the signal container
- signals = (AliTRDdataArrayF *) signalsArray->At(iDet);
- if (signals->GetNtime() == 0) {
- // Create missing containers
- signals->Allocate(nRowMax,nColMax,nTimeTotal);
+ // Get row and col of unsmeared electron to retrieve drift velocity
+ // The pad row (z-direction)
+ Int_t rowE = padPlane->GetPadRowNumberROC(loc[1]);
+ if (rowE < 0) {
+ continue;
}
- else {
- // Expand the container if neccessary
- if (fCompress) signals->Expand();
+ Double_t rowOffset = padPlane->GetPadRowOffsetROC(rowE,loc[1]);
+ // The pad column (rphi-direction)
+ Double_t offsetTilt = padPlane->GetTiltOffset(rowOffset);
+ Int_t colE = padPlane->GetPadColNumber(loc[0]+offsetTilt);
+ if (colE < 0) {
+ continue;
}
- // Create the missing dictionary containers
- if (!fSimpleSim) {
- for (iDict = 0; iDict < kNDict; iDict++) {
- dictionary[iDict] = fDigitsManager->GetDictionary(iDet,iDict);
- if (dictionary[iDict]->GetNtime() == 0) {
- dictionary[iDict]->Allocate(nRowMax,nColMax,nTimeTotal);
- }
- }
- }
-
- Int_t nDigits = 0;
+ Double_t colOffset = 0.0;
- // Don't create noise in detectors that are switched off
- if (CheckDetector(plane,chamber,sector)) {
-
- // Create the digits for this chamber
- for (iRow = 0; iRow < nRowMax; iRow++ ) {
- for (iCol = 0; iCol < nColMax; iCol++ ) {
-
- // Create summable digits
- if (fSDigits) {
-
- for (iTime = 0; iTime < nTimeTotal; iTime++) {
- Float_t signalAmp = signals->GetDataUnchecked(iRow,iCol,iTime);
- signalAmp *= fSDigitsScale;
- signalAmp = TMath::Min(signalAmp,(Float_t) 1.0e9);
- Int_t adc = (Int_t) signalAmp;
- if (adc > 0) nDigits++;
- digits->SetDataUnchecked(iRow,iCol,iTime,adc);
- }
-
- }
- // Create normal digits
- else {
+ // Normalized drift length
+ Float_t driftvelocity = calVdriftDetValue * calVdriftROC->GetValue(colE,rowE);
+ Double_t absdriftlength = TMath::Abs(driftlength);
+ if (commonParam->ExBOn()) {
+ absdriftlength /= TMath::Sqrt(GetLorentzFactor(driftvelocity));
+ }
- for (iTime = 0; iTime < nTimeTotal; iTime++) {
- Float_t signalAmp = signals->GetDataUnchecked(iRow,iCol,iTime);
- // Pad and time coupling
- signalAmp *= coupling;
- // Add the noise, starting from minus ADC baseline in electrons
- Double_t baselineEl = simParam->GetADCbaseline() * (simParam->GetADCinRange()
- / 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());
- // Convert to ADC counts. Set the overflow-bit fADCoutRange if the
- // signal is larger than fADCinRange
- Int_t adc = 0;
- if (signalAmp >= simParam->GetADCinRange()) {
- adc = ((Int_t) simParam->GetADCoutRange());
- }
- else {
- adc = ((Int_t) (signalAmp * (simParam->GetADCoutRange()
- / simParam->GetADCinRange())));
- }
- inADC[iTime] = adc;
- outADC[iTime] = adc;
- }
-
- // Apply the tail cancelation via the digital filter
- if (simParam->TCOn()) {
- DeConvExp(inADC,outADC,nTimeTotal,simParam->GetTCnexp());
- }
-
- for (iTime = 0; iTime < nTimeTotal; iTime++) {
- // Store the amplitude of the digit if above threshold
- if (outADC[iTime] > simParam->GetADCthreshold()) {
- if (fDebug > 2) {
- printf(" iRow = %d, iCol = %d, iTime = %d, adc = %f\n"
- ,iRow,iCol,iTime,outADC[iTime]);
- }
- nDigits++;
- digits->SetDataUnchecked(iRow,iCol,iTime,((Int_t) outADC[iTime]));
- }
- }
+ // 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++) {
+
+ // Now the real local coordinate system of the ROC
+ // column direction: locC
+ // row direction: locR
+ // time direction: locT
+ // locR and locC are identical to the coordinates of the corresponding
+ // volumina of the drift or amplification region.
+ // locT is defined relative to the wire plane (i.e. middle of amplification
+ // region), meaming locT = 0, and is negative for hits coming from the
+ // drift region.
+ Double_t locC = loc[0];
+ Double_t locR = loc[1];
+ Double_t locT = loc[2];
+
+ // Electron attachment
+ if (simParam->ElAttachOn()) {
+ if (gRandom->Rndm() < (absdriftlength * elAttachProp)) {
+ continue;
+ }
+ }
+
+ // Apply the diffusion smearing
+ if (simParam->DiffusionOn()) {
+ if (!(Diffusion(driftvelocity,absdriftlength,locR,locC,locT))) {
+ continue;
+ }
+ }
- }
+ // Apply E x B effects (depends on drift direction)
+ if (commonParam->ExBOn()) {
+ if (!(ExB(driftvelocity,driftlength,locC))) {
+ continue;
+ }
+ }
+ // The electron position after diffusion and ExB in pad coordinates.
+ // The pad row (z-direction)
+ rowE = padPlane->GetPadRowNumberROC(locR);
+ if (rowE < 0) continue;
+ rowOffset = padPlane->GetPadRowOffsetROC(rowE,locR);
+
+ // The pad column (rphi-direction)
+ offsetTilt = padPlane->GetTiltOffset(rowOffset);
+ colE = padPlane->GetPadColNumber(locC+offsetTilt);
+ if (colE < 0) continue;
+ colOffset = padPlane->GetPadColOffset(colE,locC+offsetTilt);
+
+ // Also re-retrieve drift velocity because col and row may have changed
+ driftvelocity = calVdriftDetValue * calVdriftROC->GetValue(colE,rowE);
+ Float_t t0 = calT0DetValue + calT0ROC->GetValue(colE,rowE);
+
+ // Convert the position to drift time [mus], using either constant drift velocity or
+ // time structure of drift cells (non-isochronity, GARFIELD calculation).
+ // Also add absolute time of hits to take pile-up events into account properly
+ Double_t drifttime;
+ if (simParam->TimeStructOn()) {
+ // Get z-position with respect to anode wire
+ Double_t zz = row0 - locR + simParam->GetAnodeWireOffset();
+ zz -= ((Int_t)(2 * zz)) / 2.0;
+ if (zz > 0.25) {
+ zz = 0.5 - zz;
}
+ // Use drift time map (GARFIELD)
+ drifttime = TimeStruct(driftvelocity,0.5*kAmWidth-1.0*locT,zz)
+ + hittime;
+ }
+ else {
+ // Use constant drift velocity
+ drifttime = -1.0 * locT / driftvelocity
+ + hittime;
}
- }
+ // 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);
+ // This is a fixed parametrization, i.e. not dependent on
+ // calibration values !
+ if (!(calibration->PadResponse(signal,dist,layer,padSignal))) continue;
+ }
+ else {
+ padSignal[0] = 0.0;
+ padSignal[1] = signal;
+ padSignal[2] = 0.0;
+ }
- // Compress the arrays
- if (!fSimpleSim) {
- digits->Compress(1,0);
- for (iDict = 0; iDict < kNDict; iDict++) {
- dictionary[iDict]->Compress(1,0);
+ // The time bin (always positive), with t0 distortion
+ 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);
+ }
+
+ signalOld[0] = 0.0;
+ signalOld[1] = 0.0;
+ signalOld[2] = 0.0;
+
+ for (iPad = 0; iPad < kNpad; iPad++) {
- totalSizeDigits += digits->GetSize();
- totalSizeDict0 += dictionary[0]->GetSize();
- totalSizeDict1 += dictionary[1]->GetSize();
- totalSizeDict2 += dictionary[2]->GetSize();
-
- Float_t nPixel = nRowMax * nColMax * nTimeTotal;
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Found %d digits in detector %d (%3.0f).\n"
- ,nDigits,iDet
- ,100.0 * ((Float_t) nDigits) / nPixel);
- }
+ Int_t colPos = colE + iPad - 1;
+ if (colPos < 0) continue;
+ if (colPos >= nColMax) break;
- if (fCompress) signals->Compress(1,0);
+ // Add the signals
+ signalOld[iPad] = signals->GetDataUnchecked(rowE,colPos,iTimeBin);
- }
+ if (colPos != colE) {
+ // Cross talk added to non-central pads
+ signalOld[iPad] += padSignal[iPad]
+ * (timeResponse + crossTalk);
+ }
+ else {
+ // W/o cross talk at central pad
+ signalOld[iPad] += padSignal[iPad]
+ * timeResponse;
+ }
- delete [] inADC;
- delete [] outADC;
+ signals->SetDataUnchecked(rowE,colPos,iTimeBin,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.0) {
+ for (dict = 0; dict < kNdict; dict++) {
+ Int_t oldTrack = dictionary[dict]->GetDataUnchecked(rowE
+ ,colPos
+ ,iTimeBin);
+ if (oldTrack == track+1) break;
+ if (oldTrack == 0) {
+ dictionary[dict]->SetDataUnchecked(rowE,colPos,iTimeBin,track+1);
+ break;
+ }
+ }
+ }
- }
+ } // Loop: pads
- if (signalsArray) {
- delete signalsArray;
- signalsArray = 0;
- }
+ } // Loop: time bins
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Total number of analyzed hits = %d\n",countHits);
- if (!fSimpleSim) {
- printf("<AliTRDdigitizer::MakeDigits> ");
- printf("Total digits data size = %d, %d, %d, %d\n",totalSizeDigits
- ,totalSizeDict0
- ,totalSizeDict1
- ,totalSizeDict2);
- }
- }
+ } // Loop: electrons of a single hit
+
+ } // Loop: hits
+
+ AliDebug(2,Form("Finished analyzing %d hits",nhit));
return kTRUE;
}
//_____________________________________________________________________________
-void AliTRDdigitizer::AddSDigitsManager(AliTRDdigitsManager *man)
+Bool_t AliTRDdigitizer::ConvertSignals(Int_t det, AliTRDdataArrayF *signals)
{
//
- // Add a digits manager for s-digits to the input list.
+ // Convert signals to digits
//
- fSDigitsManagerList->Add(man);
+ AliDebug(1,Form("Start converting the signals for detector %d",det));
-}
+ if (fSDigits) {
+ // Convert the signal array to s-digits
+ if (!Signal2SDigits(det,signals)) {
+ return kFALSE;
+ }
+ }
+ else {
+ // Convert the signal array to digits
+ if (!Signal2ADC(det,signals)) {
+ return kFALSE;
+ }
+ }
-//_____________________________________________________________________________
-void AliTRDdigitizer::DeleteSDigitsManager()
-{
- //
- // Removes digits manager from the input list.
- //
+ // Compress the arrays
+ CompressOutputArrays(det);
- fSDigitsManagerList->Delete();
+ return kTRUE;
}
//_____________________________________________________________________________
-Bool_t AliTRDdigitizer::ConvertSDigits()
+Bool_t AliTRDdigitizer::Signal2ADC(Int_t det, AliTRDdataArrayF *signals)
{
//
- // Converts s-digits to normal digits
+ // Converts the sampled electron signals to ADC values for a given chamber
//
- // Number of track dictionary arrays
- const Int_t kNDict = AliTRDdigitsManager::kNDict;
+ AliDebug(1,Form("Start converting signals to ADC values for detector=%d",det));
+
+ AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
+ if (!calibration) {
+ AliFatal("Could not get calibration object");
+ return kFALSE;
+ }
+
+ AliTRDSimParam *simParam = AliTRDSimParam::Instance();
+ if (!simParam) {
+ AliFatal("Could not get simulation parameters");
+ return kFALSE;
+ }
// Converts number of electrons to fC
- const Double_t kEl2fC = 1.602E-19 * 1.0E15;
+ const Double_t kEl2fC = 1.602e-19 * 1.0e15;
+
+ // Coupling factor
+ Double_t coupling = simParam->GetPadCoupling()
+ * simParam->GetTimeCoupling();
+ // Electronics conversion factor
+ Double_t convert = kEl2fC
+ * simParam->GetChipGain();
+ // ADC conversion factor
+ Double_t adcConvert = simParam->GetADCoutRange()
+ / simParam->GetADCinRange();
+ // The electronics baseline in mV
+ Double_t baseline = simParam->GetADCbaseline()
+ / adcConvert;
+ // The electronics baseline in electrons
+ Double_t baselineEl = baseline
+ / convert;
+
+ Int_t row = 0;
+ Int_t col = 0;
+ Int_t time = 0;
+
+ Int_t nRowMax = fGeo->GetPadPlane(det)->GetNrows();
+ Int_t nColMax = fGeo->GetPadPlane(det)->GetNcols();
+ Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
- Int_t iDict = 0;
- Int_t iRow;
- Int_t iCol;
- Int_t iTime;
-
- if (!fPar) {
- fPar = new AliTRDparameter("TRDparameter","Standard parameter");
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::ConvertSDigits> ");
- printf("Create the default parameter object\n");
- }
- }
+ // The gainfactor calibration objects
+ const AliTRDCalDet *calGainFactorDet = calibration->GetGainFactorDet();
+ AliTRDCalROC *calGainFactorROC = 0;
+ Float_t calGainFactorDetValue = 0.0;
- AliTRDSimParam* simParam = AliTRDSimParam::Instance();
- if (!simParam)
- {
- printf("<AliTRDdigitizer::ConvertSDigits> ");
- printf("Could not get simulation params\n");
+ AliTRDdataArrayS *digits = 0x0;
+
+ if (!signals) {
+ AliError(Form("Signals array for detector %d does not exist\n",det));
return kFALSE;
}
-
- AliTRDCommonParam* commonParam = AliTRDCommonParam::Instance();
- if (!commonParam)
- {
- printf("<AliTRDdigitizer::ConvertSDigits> ");
- printf("Could not get common params\n");
- return kFALSE;
+ if (signals->HasData()) {
+ // Expand the container if neccessary
+ signals->Expand();
}
-
-
- AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
- if (!calibration)
- {
- printf("<AliTRDdigitizer::ConvertSDigits> ");
- printf("Could not get calibration object\n");
+ else {
+ // Create missing containers
+ signals->Allocate(nRowMax,nColMax,nTimeTotal);
+ }
+
+ // Get the container for the digits of this detector
+ if (fDigitsManager->HasSDigits()) {
+ AliError("Digits manager has s-digits");
return kFALSE;
}
-
- Double_t sDigitsScale = 1.0 / GetSDigitsScale();
- Double_t noise = simParam->GetNoise();
- Double_t padCoupling = simParam->GetPadCoupling();
- Double_t timeCoupling = simParam->GetTimeCoupling();
- Double_t chipGain = simParam->GetChipGain();
- Double_t coupling = padCoupling * timeCoupling;
- Double_t convert = kEl2fC * chipGain;
- Double_t adcInRange = simParam->GetADCinRange();
- Double_t adcOutRange = simParam->GetADCoutRange();
- Int_t adcThreshold = simParam->GetADCthreshold();
- Int_t adcBaseline = simParam->GetADCbaseline();
-
- AliTRDdataArrayI *digitsIn;
- AliTRDdataArrayI *digitsOut;
- AliTRDdataArrayI *dictionaryIn[kNDict];
- AliTRDdataArrayI *dictionaryOut[kNDict];
+ digits = (AliTRDdataArrayS *) fDigitsManager->GetDigits(det);
+ // Allocate memory space for the digits buffer
+ if (!digits->HasData()) {
+ digits->Allocate(nRowMax,nColMax,nTimeTotal);
+ }
- Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
-
- // Loop through the detectors
- for (Int_t iDet = 0; iDet < AliTRDgeometry::Ndet(); iDet++) {
+ // Get the calibration objects
+ calGainFactorROC = calibration->GetGainFactorROC(det);
+ calGainFactorDetValue = calGainFactorDet->GetValue(det);
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::ConvertSDigits> ");
- printf("Convert detector %d to digits.\n",iDet);
- }
+ // Create the digits for this chamber
+ for (row = 0; row < nRowMax; row++ ) {
+ for (col = 0; col < nColMax; col++ ) {
- 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];
-
- digitsIn = fSDigitsManager->GetDigits(iDet);
- digitsIn->Expand();
- digitsOut = fDigitsManager->GetDigits(iDet);
- digitsOut->Allocate(nRowMax,nColMax,nTimeTotal);
- for (iDict = 0; iDict < kNDict; iDict++) {
- dictionaryIn[iDict] = fSDigitsManager->GetDictionary(iDet,iDict);
- dictionaryIn[iDict]->Expand();
- dictionaryOut[iDict] = fDigitsManager->GetDictionary(iDet,iDict);
- dictionaryOut[iDict]->Allocate(nRowMax,nColMax,nTimeTotal);
- }
+ // Check whether pad is masked
+ // Bridged pads are not considered yet!!!
+ if (calibration->IsPadMasked(det,col,row)) {
+ continue;
+ }
- for (iRow = 0; iRow < nRowMax; iRow++ ) {
- for (iCol = 0; iCol < nColMax; iCol++ ) {
-
- for (iTime = 0; iTime < nTimeTotal; iTime++) {
- Double_t signal = (Double_t) digitsIn->GetDataUnchecked(iRow,iCol,iTime);
- signal *= sDigitsScale;
- // 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 = ((Int_t) (signal * (adcOutRange / adcInRange)));
- }
- inADC[iTime] = adc;
- outADC[iTime] = adc;
- }
+ // The gain factors
+ Float_t padgain = calGainFactorDetValue
+ * calGainFactorROC->GetValue(col,row);
+ if (padgain <= 0) {
+ AliError(Form("Not a valid gain %f, %d %d %d",padgain,det,col,row));
+ }
- // Apply the tail cancelation via the digital filter
- if (simParam->TCOn()) {
- DeConvExp(inADC,outADC,nTimeTotal,simParam->GetTCnexp());
+ for (time = 0; time < nTimeTotal; time++) {
+
+ // Get the signal amplitude
+ Float_t signalAmp = signals->GetDataUnchecked(row,col,time);
+ // Pad and time coupling
+ signalAmp *= coupling;
+ // Gain factors
+ signalAmp *= padgain;
+
+ // Add the noise, starting from minus ADC baseline in electrons
+ signalAmp = TMath::Max((Double_t) gRandom->Gaus(signalAmp,simParam->GetNoise())
+ ,-baselineEl);
+
+ // Convert to mV
+ signalAmp *= convert;
+ // Add ADC baseline in mV
+ signalAmp += baseline;
+
+ // Convert to ADC counts. Set the overflow-bit fADCoutRange if the
+ // signal is larger than fADCinRange
+ Short_t adc = 0;
+ if (signalAmp >= simParam->GetADCinRange()) {
+ adc = ((Short_t) simParam->GetADCoutRange());
}
-
- 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);
- }
- }
+ else {
+ adc = TMath::Nint(signalAmp * adcConvert);
}
- }
- }
+ // Store the amplitude of the digit if above threshold
+ //if (adc != 0) {
+ // Use temporarily a threshold to reduce the digits file size
+ if (adc > (simParam->GetADCbaseline() + 2)) {
+ digits->SetDataUnchecked(row,col,time,adc);
+ }
- if (fCompress) {
- digitsIn->Compress(1,0);
- digitsOut->Compress(1,0);
- for (iDict = 0; iDict < kNDict; iDict++) {
- dictionaryIn[iDict]->Compress(1,0);
- dictionaryOut[iDict]->Compress(1,0);
- }
- }
+ } // for: time
+ } // for: col
+ } // for: row
+
+ return kTRUE;
+
+}
+
+//_____________________________________________________________________________
+Bool_t AliTRDdigitizer::Signal2SDigits(Int_t det, AliTRDdataArrayF *signals)
+{
+ //
+ // Converts the sampled electron signals to s-digits
+ //
+
+ AliDebug(1,Form("Start converting signals to s-digits for detector=%d",det));
+
+ AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
+ if (!calibration) {
+ AliFatal("Could not get calibration object");
+ return kFALSE;
+ }
- delete [] inADC;
- delete [] outADC;
+ Int_t row = 0;
+ Int_t col = 0;
+ Int_t time = 0;
- }
+ Int_t nRowMax = fGeo->GetPadPlane(det)->GetNrows();
+ Int_t nColMax = fGeo->GetPadPlane(det)->GetNcols();
+ Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
+
+ // Get the container for the digits of this detector
+ if (!fDigitsManager->HasSDigits()) {
+ AliError("Digits manager has no s-digits");
+ return kFALSE;
+ }
+ AliTRDdataArrayF *digits = (AliTRDdataArrayF *) fDigitsManager->GetDigits(det);
+ // Allocate memory space for the digits buffer
+ if (!digits->HasData()) {
+ digits->Allocate(nRowMax,nColMax,nTimeTotal);
+ }
+
+ // Create the sdigits for this chamber
+ for (row = 0; row < nRowMax; row++ ) {
+ for (col = 0; col < nColMax; col++ ) {
+ for (time = 0; time < nTimeTotal; time++) {
+ digits->SetDataUnchecked(row
+ ,col
+ ,time
+ ,signals->GetDataUnchecked(row,col,time));
+ } // for: time
+ } // for: col
+ } // for: row
return kTRUE;
}
+//_____________________________________________________________________________
+Bool_t AliTRDdigitizer::SDigits2Digits()
+{
+ //
+ // Merges the input s-digits and converts them to normal digits
+ //
+
+ if (!MergeSDigits()) {
+ return kFALSE;
+ }
+
+ return ConvertSDigits();
+
+}
+
//_____________________________________________________________________________
Bool_t AliTRDdigitizer::MergeSDigits()
{
// Number of track dictionary arrays
const Int_t kNDict = AliTRDdigitsManager::kNDict;
- if (!fPar) {
- fPar = new AliTRDparameter("TRDparameter","Standard parameter");
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MergeSDigits> ");
- printf("Create the default parameter object\n");
- }
- }
-
- AliTRDSimParam* simParam = AliTRDSimParam::Instance();
- if (!simParam)
- {
- printf("<AliTRDdigitizer::MergeSDigits> ");
- printf("Could not get simulation params\n");
- return kFALSE;
- }
-
- AliTRDCommonParam* commonParam = AliTRDCommonParam::Instance();
- if (!commonParam)
- {
- printf("<AliTRDdigitizer::MergeSDigits> ");
- printf("Could not get common params\n");
+ AliTRDSimParam *simParam = AliTRDSimParam::Instance();
+ if (!simParam) {
+ AliFatal("Could not get simulation parameters");
return kFALSE;
}
- AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
- if (!calibration)
- {
- printf("<AliTRDdigitizer::MergeSDigits> ");
- printf("Could not get calibration object\n");
+ AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
+ if (!calibration) {
+ AliFatal("Could not get calibration object");
return kFALSE;
}
Int_t iDict = 0;
Int_t jDict = 0;
- AliTRDdataArrayI *digitsA;
- AliTRDdataArrayI *digitsB;
- AliTRDdataArrayI *dictionaryA[kNDict];
- AliTRDdataArrayI *dictionaryB[kNDict];
+ AliTRDdataArrayF *digitsA;
+ AliTRDdataArrayF *digitsB;
+ AliTRDdataArrayI *dictionaryA[kNDict];
+ AliTRDdataArrayI *dictionaryB[kNDict];
+ AliTRDdigitsManager *mergeSDigitsManager = 0x0;
// Get the first s-digits
fSDigitsManager = (AliTRDdigitsManager *) fSDigitsManagerList->First();
- if (!fSDigitsManager) return kFALSE;
+ if (!fSDigitsManager) {
+ AliError("No SDigits manager");
+ return kFALSE;
+ }
// Loop through the other sets of s-digits
- AliTRDdigitsManager *mergeSDigitsManager;
mergeSDigitsManager = (AliTRDdigitsManager *)
fSDigitsManagerList->After(fSDigitsManager);
- if (fDebug > 0) {
- if (mergeSDigitsManager) {
- printf("<AliTRDdigitizer::MergeSDigits> ");
- printf("Merge %d input files.\n",fSDigitsManagerList->GetSize());
- }
- else {
- printf("<AliTRDdigitizer::MergeSDigits> ");
- printf("Only one input file.\n");
- }
+ if (mergeSDigitsManager) {
+ AliDebug(1,Form("Merge %d input files.",fSDigitsManagerList->GetSize()));
+ }
+ else {
+ AliDebug(1,"Only one input file.");
}
Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
// 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 nRowMax = fGeo->GetPadPlane(iDet)->GetNrows();
+ Int_t nColMax = fGeo->GetPadPlane(iDet)->GetNcols();
// Loop through the pixels of one detector and add the signals
- digitsA = fSDigitsManager->GetDigits(iDet);
- digitsB = mergeSDigitsManager->GetDigits(iDet);
+ digitsA = (AliTRDdataArrayF *) fSDigitsManager->GetDigits(iDet);
+ digitsB = (AliTRDdataArrayF *) mergeSDigitsManager->GetDigits(iDet);
digitsA->Expand();
+ if (!digitsA->GetDataSize()) continue;
digitsB->Expand();
+ if (!digitsB->GetDataSize()) continue;
for (iDict = 0; iDict < kNDict; iDict++) {
- dictionaryA[iDict] = fSDigitsManager->GetDictionary(iDet,iDict);
- dictionaryB[iDict] = mergeSDigitsManager->GetDictionary(iDet,iDict);
+ dictionaryA[iDict] = (AliTRDdataArrayI *) fSDigitsManager->GetDictionary(iDet,iDict);
+ dictionaryB[iDict] = (AliTRDdataArrayI *) mergeSDigitsManager->GetDictionary(iDet,iDict);
dictionaryA[iDict]->Expand();
dictionaryB[iDict]->Expand();
}
if (doMerge) {
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::MergeSDigits> ");
- printf("Merge detector %d of input no.%d\n",iDet,iMerge+1);
- }
+ AliDebug(1,Form("Merge detector %d of input no.%d",iDet,iMerge+1));
for (Int_t iRow = 0; iRow < nRowMax; iRow++ ) {
for (Int_t iCol = 0; iCol < nColMax; iCol++ ) {
for (Int_t iTime = 0; iTime < nTimeTotal; iTime++) {
// Add the amplitudes of the summable digits
- Int_t ampA = digitsA->GetDataUnchecked(iRow,iCol,iTime);
- Int_t ampB = digitsB->GetDataUnchecked(iRow,iCol,iTime);
+ Float_t ampA = digitsA->GetDataUnchecked(iRow,iCol,iTime);
+ Float_t ampB = digitsB->GetDataUnchecked(iRow,iCol,iTime);
ampA += ampB;
digitsA->SetDataUnchecked(iRow,iCol,iTime,ampA);
- // Add the mask to the track id if defined.
+ // Add the mask to the track id if defined.
for (iDict = 0; iDict < kNDict; iDict++) {
Int_t trackB = dictionaryB[iDict]->GetDataUnchecked(iRow,iCol,iTime);
if ((fMasks) && (trackB > 0)) {
if (trackA == 0) {
trackA = trackB + fMasks[iMerge];
dictionaryA[iDict]->SetDataUnchecked(iRow,iCol,iTime,trackA);
- }
- }
- }
- }
+ } // if: track A == 0
+ } // for: jDict
+ } // if: fMasks and trackB > 0
+ } // for: iDict
- }
- }
- }
+ } // for: iTime
+ } // for: iCol
+ } // for: iRow
- }
+ } // if: doMerge
+
+ mergeSDigitsManager->RemoveDigits(iDet);
+ mergeSDigitsManager->RemoveDictionaries(iDet);
if (fCompress) {
digitsA->Compress(1,0);
- digitsB->Compress(1,0);
for (iDict = 0; iDict < kNDict; iDict++) {
dictionaryA[iDict]->Compress(1,0);
- dictionaryB[iDict]->Compress(1,0);
}
}
- }
+ } // for: detectors
// The next set of s-digits
mergeSDigitsManager = (AliTRDdigitsManager *)
fSDigitsManagerList->After(mergeSDigitsManager);
- }
+ } // while: mergeDigitsManagers
return kTRUE;
}
//_____________________________________________________________________________
-Bool_t AliTRDdigitizer::SDigits2Digits()
+Bool_t AliTRDdigitizer::ConvertSDigits()
{
//
- // Merges the input s-digits and converts them to normal digits
+ // Converts s-digits to normal digits
//
- if (!MergeSDigits()) return kFALSE;
-
- return ConvertSDigits();
+ AliTRDdataArrayF *digitsIn = 0x0;
-}
+ if (!fSDigitsManager->HasSDigits()) {
+ AliError("No s-digits in digits manager");
+ return kFALSE;
+ }
-//_____________________________________________________________________________
-Bool_t AliTRDdigitizer::CheckDetector(Int_t plane, Int_t chamber, Int_t sector)
-{
- //
- // Checks whether a detector is enabled
- //
+ // Loop through the detectors
+ for (Int_t det = 0; det < AliTRDgeometry::Ndet(); det++) {
- if (fSimpleSim) return kTRUE;
+ // Get the merged s-digits (signals)
+ digitsIn = (AliTRDdataArrayF *) fSDigitsManager->GetDigits(det);
+ if (!digitsIn->HasData()) {
+ AliDebug(2,Form("No digits for det=%d",det));
+ continue;
+ }
- if ((fTRD->GetSensChamber() >= 0) &&
- (fTRD->GetSensChamber() != chamber)) return kFALSE;
- if ((fTRD->GetSensPlane() >= 0) &&
- (fTRD->GetSensPlane() != plane)) return kFALSE;
- if ( fTRD->GetSensSector() >= 0) {
- Int_t sens1 = fTRD->GetSensSector();
- Int_t sens2 = sens1 + fTRD->GetSensSectorRange();
- sens2 -= ((Int_t) (sens2 / AliTRDgeometry::Nsect()))
- * AliTRDgeometry::Nsect();
- if (sens1 < sens2) {
- if ((sector < sens1) || (sector >= sens2)) return kFALSE;
+ // Convert the merged sdigits to digits
+ if (!Signal2ADC(det,digitsIn)) {
+ continue;
}
- else {
- if ((sector < sens1) && (sector >= sens2)) return kFALSE;
+
+ // Copy the dictionary information to the output array
+ if (!CopyDictionary(det)) {
+ continue;
}
- }
+
+ // Delete
+ fSDigitsManager->RemoveDigits(det);
+ fSDigitsManager->RemoveDictionaries(det);
+
+ // Compress the arrays
+ CompressOutputArrays(det);
+
+ } // for: detector numbers
return kTRUE;
}
//_____________________________________________________________________________
-Bool_t AliTRDdigitizer::WriteDigits() const
+Bool_t AliTRDdigitizer::CopyDictionary(Int_t det)
{
//
- // Writes out the TRD-digits and the dictionaries
+ // Copies the dictionary information from the s-digits arrays
+ // to the output arrays
//
- //Write parameters
- fRunLoader->CdGAFile();
- if (!gFile->Get("TRDparameter")) GetParameter()->Write();
+ AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
+ if (!calibration) {
+ AliFatal("Could not get calibration object");
+ return kFALSE;
+ }
- // Store the digits and the dictionary in the tree
- return fDigitsManager->WriteDigits();
+ AliDebug(1,Form("Start copying dictionaries for detector=%d",det));
+
+ const Int_t kNDict = AliTRDdigitsManager::kNDict;
+ AliTRDdataArrayI *dictionaryIn[kNDict];
+ AliTRDdataArrayI *dictionaryOut[kNDict];
+
+ Int_t nRowMax = fGeo->GetPadPlane(det)->GetNrows();
+ Int_t nColMax = fGeo->GetPadPlane(det)->GetNcols();
+ Int_t nTimeTotal = calibration->GetNumberOfTimeBins();
+
+ Int_t row = 0;
+ Int_t col = 0;
+ Int_t time = 0;
+ Int_t dict = 0;
+
+ for (dict = 0; dict < kNDict; dict++) {
+
+ dictionaryIn[dict] = (AliTRDdataArrayI *) fSDigitsManager->GetDictionary(det,dict);
+ dictionaryIn[dict]->Expand();
+ dictionaryOut[dict] = (AliTRDdataArrayI *) fDigitsManager->GetDictionary(det,dict);
+ dictionaryOut[dict]->Allocate(nRowMax,nColMax,nTimeTotal);
+
+ for (row = 0; row < nRowMax; row++) {
+ for (col = 0; col < nColMax; col++) {
+ for (time = 0; time < nTimeTotal; time++) {
+
+ Int_t track = dictionaryIn[dict]->GetDataUnchecked(row,col,time);
+ dictionaryOut[dict]->SetDataUnchecked(row,col,time,track);
+
+ } // for: time
+ } // for: col
+ } // for: row
+
+ } // for: dictionaries
+
+ return kTRUE;
}
//_____________________________________________________________________________
-void AliTRDdigitizer::DeConvExp(Double_t *source, Double_t *target
- , Int_t n, Int_t nexp)
+void AliTRDdigitizer::CompressOutputArrays(Int_t det)
{
//
- // Does the deconvolution by the digital filter.
- //
- // Author: Marcus Gutfleisch, KIP Heidelberg
- // Optimized for: New TRF from Venelin Angelov, simulated with CADENCE
- // Pad-ground capacitance = 25 pF
- // Pad-pad cross talk capacitance = 6 pF
- // For 10 MHz digitization, corresponding to 20 time bins
- // in the drift region
+ // Compress the output arrays
//
- Double_t rates[2];
- Double_t coefficients[2];
- Double_t Dt = 0.100; // time bin width [mus] for 10 MHz sampling frequence
+ const Int_t kNDict = AliTRDdigitsManager::kNDict;
- /* initialize (coefficient = alpha, rates = lambda) */
-
- rates[0] = 0.7680;
- rates[1] = 0.0995;
+ AliTRDdataArrayS *digits = 0x0;
+ AliTRDdataArrayI *dictionary = 0x0;
- rates[0] = TMath::Exp(-Dt/(rates[0]));
- rates[1] = TMath::Exp(-Dt/(rates[1]));
+ if (fCompress) {
- // dummy initialization
- coefficients[0] = 0.0000;
- coefficients[1] = 0.0000;
+ digits = (AliTRDdataArrayS *) fDigitsManager->GetDigits(det);
+ digits->Compress(1,0);
+ for (Int_t dict = 0; dict < kNDict; dict++) {
+ dictionary = (AliTRDdataArrayI *) fDigitsManager->GetDictionary(det,dict);
+ dictionary->Compress(1,0);
+
+ }
- if( nexp == 1 ) {
- coefficients[0] = 0.0844;
- coefficients[1] = 0.0000;
}
- if( nexp == 2 ) {
- coefficients[0] = 0.1445;
- coefficients[1] = 0.7524;
- }
-
- Int_t i, k;
- Double_t reminder[2];
- Double_t correction, result;
- /* attention: computation order is important */
- correction=0.0;
- for ( k = 0; k < nexp; k++ ) reminder[k]=0.0;
-
- for ( i = 0; i < n; i++ ) {
- result = ( source[i] - correction ); /* no rescaling */
- target[i] = result;
-
- for ( k = 0; k < nexp; k++ ) reminder[k] = rates[k]
- * ( reminder[k] + coefficients[k] * result);
-
- correction=0.0;
- for ( k = 0; k < nexp; k++ ) correction += reminder[k];
- }
-
+}
+
+//_____________________________________________________________________________
+Bool_t AliTRDdigitizer::WriteDigits() const
+{
+ //
+ // Writes out the TRD-digits and the dictionaries
+ //
+
+ // Write parameters
+ fRunLoader->CdGAFile();
+
+ // Store the digits and the dictionary in the tree
+ return fDigitsManager->WriteDigits();
+
}
//_____________________________________________________________________________
fEvent = iEvent;
- if (!fRunLoader)
- {
- Error("InitOutput","Run Loader is NULL");
- return;
- }
- AliLoader* loader = fRunLoader->GetLoader("TRDLoader");
- if (!loader)
- {
- Error("Open","Can not get TRD loader from Run Loader");
- return;
- }
-
- TTree* tree = 0;
+ if (!fRunLoader) {
+ AliError("Run Loader is NULL");
+ return;
+ }
+
+ AliLoader *loader = fRunLoader->GetLoader("TRDLoader");
+ if (!loader) {
+ AliError("Can not get TRD loader from Run Loader");
+ return;
+ }
+
+ TTree *tree = 0;
- if (fSDigits)
- {
- //if we produce SDigits
+ if (fSDigits) {
+ // If we produce SDigits
tree = loader->TreeS();
- if (!tree)
- {
+ if (!tree) {
loader->MakeTree("S");
tree = loader->TreeS();
- }
- }
- else
- {//if we produce Digits
- tree = loader->TreeD();
- if (!tree)
- {
- loader->MakeTree("D");
- tree = loader->TreeD();
- }
- }
+ }
+ }
+ else {
+ // If we produce Digits
+ tree = loader->TreeD();
+ if (!tree) {
+ loader->MakeTree("D");
+ tree = loader->TreeD();
+ }
+ }
+
fDigitsManager->SetEvent(iEvent);
fDigitsManager->MakeBranch(tree);
SampleTimeStruct(vdrift);
- // indices:
- Int_t r1 = (Int_t)(10*dist);
- Int_t r2 = r1+1;
- if (r1<0) r1 = 0;
- if (r1>37) r1 = 37;
- 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) {
- printf("<AliTRDparameter::TimeStruct> Warning. Indices out of range: ");
- printf("dist=%.2f, z=%.2f, r1=%d, kz1=%d\n",dist,z,r1,kz1);
+ // Indices:
+ Int_t r1 = (Int_t)(10 * dist);
+ if (r1 < 0) r1 = 0;
+ if (r1 > 37) r1 = 37;
+ Int_t r2 = r1 + 1;
+ if (r2 < 0) r2 = 0;
+ if (r2 > 37) r2 = 37;
+ 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)) {
+ AliWarning(Form("Indices out of range: dist=%.2f, z=%.2f, r1=%d, kz1=%d"
+ ,dist,z,r1,kz1));
}
- const Float_t ky111 = fTimeStructInfo.fTimeStruct1[r1+38*kz1];
- const Float_t ky221 = (r2 <= 37 && kz2 <= 10) ? fTimeStructInfo.fTimeStruct1[r2+38*kz2] : fTimeStructInfo.fTimeStruct1[37+38*10];
- const Float_t ky121 = (kz2 <= 10) ? fTimeStructInfo.fTimeStruct1[r1+38*kz2] : fTimeStructInfo.fTimeStruct1[r1+38*10];
- const Float_t ky211 = (r2 <= 37) ? fTimeStructInfo.fTimeStruct1[r2+38*kz1] : fTimeStructInfo.fTimeStruct1[37+38*kz1];
+ const Float_t ky111 = fTimeStruct1[r1+38*kz1];
+ const Float_t ky221 = ((r2 <= 37) && (kz2 <= 10))
+ ? fTimeStruct1[r2+38*kz2]
+ : fTimeStruct1[37+38*10];
+ const Float_t ky121 = (kz2 <= 10)
+ ? fTimeStruct1[r1+38*kz2]
+ : fTimeStruct1[r1+38*10];
+ const Float_t ky211 = (r2 <= 37)
+ ? 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 ky222 = (r2 <= 37 && kz2 <= 10) ? fTimeStructInfo.fTimeStruct2[r2+38*kz2] : fTimeStructInfo.fTimeStruct2[37+38*10];
- const Float_t ky122 = (kz2 <= 10) ? fTimeStructInfo.fTimeStruct2[r1+38*kz2] : fTimeStructInfo.fTimeStruct2[r1+38*10];
- const Float_t ky212 = (r2 <= 37) ? fTimeStructInfo.fTimeStruct2[r2+38*kz1] : fTimeStructInfo.fTimeStruct2[37+38*kz1];
+ const Float_t ky112 = fTimeStruct2[r1+38*kz1];
+ const Float_t ky222 = ((r2 <= 37) && (kz2 <= 10))
+ ? fTimeStruct2[r2+38*kz2]
+ : fTimeStruct2[37+38*10];
+ const Float_t ky122 = (kz2 <= 10)
+ ? fTimeStruct2[r1+38*kz2]
+ : fTimeStruct2[r1+38*10];
+ const Float_t ky212 = (r2 <= 37)
+ ? 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;
+ dist -= AliTRDgeometry::AmThick() / 2.0;
// Get the drift times for the drift velocities fVDlo and fVDhi
- const Float_t ktdrift1 =
- ( TMath::Abs(dist)>0.005 || z>0.005 ) ? (ky21-ky11)*100*z/2.5+ky11-(ky21-ky11)*kz1 : 0.0;
- const Float_t ktdrift2 =
- ( TMath::Abs(dist)>0.005 || z>0.005 ) ? (ky22-ky12)*100*z/2.5+ky12-(ky22-ky12)*kz1 : 0.0;
+ const Float_t ktdrift1 = ((TMath::Abs(dist) > 0.005) || (z > 0.005))
+ ? (ky21 - ky11) * 100 * z / 2.5 + ky11 - (ky21 - ky11) * kz1
+ : 0.0;
+ const Float_t ktdrift2 = ((TMath::Abs(dist) > 0.005) || (z > 0.005))
+ ? (ky22 - ky12) * 100 * z / 2.5 + ky12 - (ky22 - ky12) * kz1
+ : 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;
-
-
- //printf("(%.2f, %.2f): %f, %f -> %f\n",
- // dist+AliTRDgeometry::AmThick()/2.0, z, ktdrift1, ktdrift2, a*fDriftVelocity+b);
+ Float_t a = (ktdrift2 - ktdrift1)
+ / (fVDhi - fVDlo);
+ Float_t b = ktdrift2 - a * fVDhi;
return a * vdrift + b;
// Drift Time data calculated with Garfield (by C.Lippmann)
//
- //TODO make caching proper, if same timing structure is selected: do not update timestructs!
-
- if (vdrift == fTimeStructInfo.fLastVdrift)
+ // Nothing to do
+ if (vdrift == fTimeLastVdrift) {
return;
-
- fTimeStructInfo.fLastVdrift = vdrift;
+ }
+ fTimeLastVdrift = vdrift;
- // drift time maps are saved for some drift velocity values (in drift region):
+ // Drift time maps are saved for some drift velocity values (in drift region):
Float_t fVDsmp[8];
fVDsmp[0] = 1.032;
fVDsmp[1] = 1.158;
fVDsmp[6] = 1.959;
fVDsmp[7] = 2.134;
- if ( vdrift < fVDsmp[0] ) {
- printf("<AliTRDparameter::SampleTimeStruct> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
- printf("<AliTRDparameter::SampleTimeStruct> Drift Velocity too small (%.3f<%.3f)\n"
- , vdrift, fVDsmp[0]);
- printf("<AliTRDparameter::SampleTimeStruct> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+ if (vdrift < fVDsmp[0]) {
+ AliWarning(Form("Drift Velocity too small (%.3f<%.3f)",vdrift,fVDsmp[0]));
vdrift = fVDsmp[0];
- } else if ( vdrift > fVDsmp[7] ) {
- printf("<AliTRDparameter::SampleTimeStruct> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
- printf("<AliTRDparameter::SampleTimeStruct> Drift Velocity too large (%.3f>%.3f)\n"
- , vdrift,fVDsmp[6]);
- printf("<AliTRDparameter::SampleTimeStruct> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
+ }
+ else if (vdrift > fVDsmp[7]) {
+ AliWarning(Form("Drift Velocity too large (%.3f>%.3f)",vdrift,fVDsmp[6]));
vdrift = fVDsmp[7];
}
const Int_t ktimebin = 38;
- const Int_t kZbin = 11;
+ const Int_t kZbin = 11;
// Garfield simulation at UD = -1500V; vd = 1.032cm/microsec, <driftfield> = 525V/cm
Float_t time1500[ktimebin][kZbin] =
{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
+ //
+
+ if (vdrift == fDiffLastVdrift) {
return;
-
- if (!fPar) {
- fPar = new AliTRDparameter("TRDparameter","Standard TRD parameter");
- if (fDebug > 0) {
- printf("<AliTRDdigitizer::RecalcDiffusion> ");
- printf("Create the default parameter object\n");
- }
}
-
- AliTRDSimParam* simParam = AliTRDSimParam::Instance();
- if (!simParam)
- {
- printf("<AliTRDdigitizer::RecalcDiffusion> ");
- printf("Could not get simulation params\n");
+
+ AliTRDSimParam *simParam = AliTRDSimParam::Instance();
+ if (!simParam) {
+ AliFatal("Could not get simulation parameters");
return;
}
- AliTRDCommonParam* commonParam = AliTRDCommonParam::Instance();
- if (!commonParam)
- {
- printf("<AliTRDdigitizer::RecalcDiffusion> ");
- printf("Could not get common params\n");
+ AliTRDCommonParam *commonParam = AliTRDCommonParam::Instance();
+ if (!commonParam) {
+ AliFatal("Could not get common parameters");
return;
}
- AliTRDcalibDB* calibration = AliTRDcalibDB::Instance();
- if (!calibration)
- {
- printf("<AliTRDdigitizer::RecalcDiffusion> ");
- printf("Could not get calibration object\n");
+ AliTRDcalibDB *calibration = AliTRDcalibDB::Instance();
+ if (!calibration) {
+ AliFatal("Could not get calibration object");
return;
}
+
+ fDiffLastVdrift = vdrift;
+
+ if (simParam->IsXenon()) {
- Float_t field = commonParam->GetField();
- fDiffusionInfo.fLastVdrift = 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;
- }
+ //
+ // Vd and B-field dependent diffusion and Lorentz angle
+ //
+
+ // 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
- //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;
- }
-
- //OmegaTau
- fDiffusionInfo.fOmegaTau = calibration->GetOmegaTau(vdrift);
+ // DiffusionL
+ 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;
- //Lorentzfactor
- {
+ // DiffusionT
+ 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
+ fOmegaTau = calibration->GetOmegaTau(vdrift,field);
+
+ // Lorentzfactor
+ if (commonParam->ExBOn()) {
+ fLorentzFactor = 1.0 / (1.0 + fOmegaTau*fOmegaTau);
+ }
+ else {
+ fLorentzFactor = 1.0;
+ }
+
+ }
+ else if (simParam->IsArgon()) {
+
+ // Diffusion constants and Lorentz angle only for B = 0.5T
+ fDiffusionL = 0.0182;
+ fDiffusionT = 0.0159;
+ fOmegaTau = 0.0219769;
if (commonParam->ExBOn()) {
- fDiffusionInfo.fLorentzFactor = 1.0 / (1.0 + fDiffusionInfo.fOmegaTau*fDiffusionInfo.fOmegaTau);
+ fLorentzFactor = 1.0 / (1.0 + fOmegaTau*fOmegaTau);
}
else {
- fDiffusionInfo.fLorentzFactor = 1.0;
+ fLorentzFactor = 1.0;
}
+
}
+
}
//_____________________________________________________________________________
//
RecalcDiffusion(vdrift);
- return fDiffusionInfo.fDiffusionL;
+
+ return fDiffusionL;
+
}
//_____________________________________________________________________________
//
RecalcDiffusion(vdrift);
- return fDiffusionInfo.fDiffusionT;
+
+ return fDiffusionT;
+
}
//_____________________________________________________________________________
-Int_t AliTRDdigitizer::Diffusion(Float_t vdrift, Double_t driftlength, Double_t *xyz)
+Int_t AliTRDdigitizer::Diffusion(Float_t vdrift, Double_t absdriftlength
+ , Double_t &lRow, Double_t &lCol, Double_t &lTime)
{
//
- // Applies the diffusion smearing to the position of a single electron
+ // Applies the diffusion smearing to the position of a single electron.
+ // Depends on absolute drift length.
//
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 driftSqrt = TMath::Sqrt(absdriftlength);
+ Float_t sigmaT = driftSqrt * fDiffusionT;
+ Float_t sigmaL = driftSqrt * fDiffusionL;
+ lRow = gRandom->Gaus(lRow ,sigmaT);
+ lCol = gRandom->Gaus(lCol ,sigmaT * GetLorentzFactor(vdrift));
+ lTime = gRandom->Gaus(lTime,sigmaL * GetLorentzFactor(vdrift));
return 1;
+
}
//_____________________________________________________________________________
Float_t AliTRDdigitizer::GetLorentzFactor(Float_t vd)
{
+ //
+ // Returns the recalculated Lorentz factor
+ //
+
RecalcDiffusion(vd);
- return fDiffusionInfo.fLorentzFactor;
+
+ return fLorentzFactor;
+
}
//_____________________________________________________________________________
-Int_t AliTRDdigitizer::ExB(Float_t vdrift, Double_t driftlength, Double_t *xyz)
+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
+ // Applies E x B effects to the position of a single electron.
+ // Depends on signed drift length.
//
RecalcDiffusion(vdrift);
-
- xyz[0] = xyz[0];
- xyz[1] = xyz[1] + fDiffusionInfo.fOmegaTau * driftlength;
- xyz[2] = xyz[2];
+
+ lCol = lCol + fOmegaTau * driftlength;
return 1;
+
}
git://git.uio.no / u / mrichter / AliRoot.git / blobdiff