X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TRD%2FAliTRD.cxx;h=7e44e869da9294f7302fefc1215cdd7048d49c24;hb=f42776078da26d425e059c66c879ededa74d15d6;hp=4762f1f531007d3d1c3f1160a2ab4b9bd570d887;hpb=0a29d0f1e700a829bfff538d0133a28be811d937;p=u%2Fmrichter%2FAliRoot.git diff --git a/TRD/AliTRD.cxx b/TRD/AliTRD.cxx index 4762f1f5310..7e44e869da9 100644 --- a/TRD/AliTRD.cxx +++ b/TRD/AliTRD.cxx @@ -13,126 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.37 2002/03/25 20:01:49 cblume -Introduce parameter class - -Revision 1.36 2002/02/11 14:25:27 cblume -Geometry update, compressed hit structure - -Revision 1.35 2001/11/14 12:08:44 cblume -Remove unneccessary header files - -Revision 1.34 2001/11/14 10:50:45 cblume -Changes in digits IO. Add merging of summable digits - -Revision 1.33 2001/11/06 17:19:41 cblume -Add detailed geometry and simple simulator - -Revision 1.32 2001/10/08 06:57:33 hristov -Branches for TRD digits are created only during the digitisation - -Revision 1.31 2001/08/30 09:30:30 hristov -The split level of branches is set to 99 - -Revision 1.30 2001/05/28 17:07:58 hristov -Last minute changes; ExB correction in AliTRDclusterizerV1; taking into account of material in G10 TEC frames and material between TEC planes (C.Blume,S.Sedykh) - -Revision 1.29 2001/05/21 16:45:47 hristov -Last minute changes (C.Blume) - -Revision 1.28 2001/05/16 14:57:27 alibrary -New files for folders and Stack - -Revision 1.27 2001/05/08 07:05:02 hristov -Loop variable declared once (HP, Sun) - -Revision 1.26 2001/05/07 08:03:22 cblume -Generate also hits in the amplification region - -Revision 1.25 2001/03/13 09:30:35 cblume -Update of digitization. Moved digit branch definition to AliTRD - -Revision 1.24 2001/01/26 19:56:49 hristov -Major upgrade of AliRoot code - -Revision 1.23 2000/11/01 14:53:20 cblume -Merge with TRD-develop - -Revision 1.17.2.6 2000/10/15 23:29:08 cblume -Introduced more detailed geometry for the display - -Revision 1.17.2.5 2000/10/06 16:49:46 cblume -Made Getters const - -Revision 1.17.2.4 2000/10/04 16:34:57 cblume -Replace include files by forward declarations - -Revision 1.17.2.3 2000/09/22 14:45:17 cblume -Included changes for the tracking - -Revision 1.17.2.2 2000/09/18 13:25:13 cblume -Included LoadPoints() method to display the TR photons - -Revision 1.22 2000/10/02 21:28:19 fca -Removal of useless dependecies via forward declarations - -Revision 1.21 2000/06/09 11:10:07 cblume -Compiler warnings and coding conventions, next round - -Revision 1.20 2000/06/08 18:32:57 cblume -Make code compliant to coding conventions - -Revision 1.19 2000/06/07 16:25:37 cblume -Try to remove compiler warnings on Sun and HP - -Revision 1.18 2000/05/08 16:17:27 cblume -Merge TRD-develop - -Revision 1.21 2000/06/09 11:10:07 cblume -Compiler warnings and coding conventions, next round - -Revision 1.20 2000/06/08 18:32:57 cblume -Make code compliant to coding conventions - -Revision 1.19 2000/06/07 16:25:37 cblume -Try to remove compiler warnings on Sun and HP - -Revision 1.18 2000/05/08 16:17:27 cblume -Merge TRD-develop - -Revision 1.17.2.1 2000/05/08 14:28:59 cblume -Introduced SetPHOShole() and SetRICHhole(). AliTRDrecPoint container is now a TObjArray - -Revision 1.17 2000/02/28 19:10:26 cblume -Include the new TRD classes - -Revision 1.16.2.2 2000/02/28 17:53:24 cblume -Introduce TRD geometry classes - -Revision 1.16.2.1 2000/02/28 17:04:19 cblume -Include functions and data members for AliTRDrecPoint - -Revision 1.16 2000/01/19 17:17:35 fca -Introducing a list of lists of hits -- more hits allowed for detector now - -Revision 1.15 1999/11/02 17:04:25 fca -Small syntax change for HP compiler - -Revision 1.14 1999/11/02 16:57:02 fca -Avoid non ansi warnings on HP compilers - -Revision 1.13 1999/11/02 16:35:56 fca -New version of TRD introduced - -Revision 1.12 1999/11/01 20:41:51 fca -Added protections against using the wrong version of FRAME - -Revision 1.11 1999/09/29 09:24:34 fca -Introduction of the Copyright and cvs Log - -*/ +/* $Id$ */ /////////////////////////////////////////////////////////////////////////////// // // @@ -143,131 +24,93 @@ Introduction of the Copyright and cvs Log /////////////////////////////////////////////////////////////////////////////// #include -#include +#include +#include +#include +#include +#include #include #include -#include -#include #include -#include -#include #include - -#include "AliRun.h" +#include +#include +#include + #include "AliConst.h" #include "AliDigit.h" +#include "AliLoader.h" +#include "AliLog.h" +#include "AliMC.h" #include "AliMagF.h" -#include "AliMC.h" - +#include "AliRun.h" +#include "AliTrackReference.h" +#include "AliRawReader.h" + #include "AliTRD.h" -#include "AliTRDhit.h" -#include "AliTRDpoints.h" #include "AliTRDdigit.h" #include "AliTRDdigitizer.h" -#include "AliTRDclusterizer.h" -#include "AliTRDgeometryHole.h" -#include "AliTRDgeometryFull.h" -#include "AliTRDrecPoint.h" -#include "AliTRDcluster.h" #include "AliTRDdigitsManager.h" -#include "AliTRDtrackHits.h" +#include "AliTRDgeometry.h" +#include "AliTRDhit.h" +#include "AliTRDpoints.h" +#include "AliTRDrawData.h" +#include "AliTRDSimParam.h" +#include "AliTRDRecParam.h" +#include "AliTRDCommonParam.h" +#include "AliTRDcalibDB.h" ClassImp(AliTRD) //_____________________________________________________________________________ AliTRD::AliTRD() + :AliDetector() + ,fGeometry(0) + ,fGasDensity(0) + ,fFoilDensity(0) + ,fDrawTR(0) + ,fDisplayType(0) { // // Default constructor // - - fIshunt = 0; - fGasMix = 0; - fHits = 0; - fDigits = 0; - - fRecPoints = 0; - fNRecPoints = 0; - - fGeometry = 0; - - fGasDensity = 0; - fFoilDensity = 0; - - fDrawTR = 0; - fDisplayType = 0; - fTrackHits = 0; - fHitType = 0; - } //_____________________________________________________________________________ AliTRD::AliTRD(const char *name, const char *title) - : AliDetector(name,title) + :AliDetector(name,title) + ,fGeometry(0) + ,fGasDensity(0) + ,fFoilDensity(0) + ,fDrawTR(0) + ,fDisplayType(0) { // // Standard constructor for the TRD // - // Check that FRAME is there otherwise we have no place where to - // put TRD - AliModule* frame = gAlice->GetModule("FRAME"); + // Check that FRAME is there otherwise we have no place where to put TRD + AliModule *frame = gAlice->GetModule("FRAME"); if (!frame) { - Error("Ctor","TRD needs FRAME to be present\n"); + AliError("TRD needs FRAME to be present\n"); exit(1); } - // Define the TRD geometry according to the FRAME geometry - if (frame->IsVersion() == 0) { - // Geometry with hole - fGeometry = new AliTRDgeometryHole(); - } - else if (frame->IsVersion() == 1) { - // Geometry without hole - fGeometry = new AliTRDgeometryFull(); + // Define the TRD geometry + if ((frame->IsVersion() == 0) || + (frame->IsVersion() == 1)) { + fGeometry = new AliTRDgeometry(); } else { - Error("Ctor","Could not find valid FRAME version\n"); + AliError("Could not find valid FRAME version\n"); exit(1); } // Allocate the hit array - fHits = new TClonesArray("AliTRDhit" ,405); - gAlice->AddHitList(fHits); - - // Allocate the digits array - fDigits = 0; - - // Allocate the rec point array - fRecPoints = new TObjArray(400); - fNRecPoints = 0; - - fIshunt = 0; - fGasMix = 1; - - fGasDensity = 0; - fFoilDensity = 0; - - fDrawTR = 0; - fDisplayType = 0; - - fTrackHits = 0; - fHitType = 2; - - SetMarkerColor(kWhite); - -} - -//_____________________________________________________________________________ -AliTRD::AliTRD(const AliTRD &trd) -{ - // - // Copy constructor - // - - ((AliTRD &) trd).Copy(*this); + fHits = new TClonesArray("AliTRDhit",405); + gAlice->GetMCApp()->AddHitList(fHits); } @@ -278,142 +121,92 @@ AliTRD::~AliTRD() // TRD destructor // - fIshunt = 0; - if (fGeometry) { delete fGeometry; - fGeometry = 0; + fGeometry = 0; } + if (fHits) { delete fHits; - fHits = 0; - } - if (fRecPoints) { - delete fRecPoints; - fRecPoints = 0; - } - if (fTrackHits) { - delete fTrackHits; - fTrackHits = 0; + fHits = 0; } } //_____________________________________________________________________________ -void AliTRD::AddCluster(Float_t *pos, Int_t *digits, Int_t det, Float_t amp - , Int_t *tracks, Float_t sigmaY2, Int_t iType) +void AliTRD::Hits2Digits() { // - // Add a cluster for the TRD + // Create digits // - Int_t pla = fGeometry->GetPlane(det); - Int_t cha = fGeometry->GetChamber(det); - Int_t sec = fGeometry->GetSector(det); - - Float_t padRow = pos[0]; - Float_t padCol = pos[1]; - Float_t row0 = fGeometry->GetRow0(pla,cha,sec); - Float_t col0 = fGeometry->GetCol0(pla); - Float_t rowSize = fGeometry->GetRowPadSize(pla,cha,sec); - Float_t colSize = fGeometry->GetColPadSize(pla); - - AliTRDcluster *c = new AliTRDcluster(); + AliTRDdigitizer digitizer("TRDdigitizer","TRD digitizer class"); + AliLog::SetClassDebugLevel("TRDdigitizer",AliDebugLevel()); + + // Initialization + digitizer.InitDetector(); + + if (!fLoader->TreeH()) { + fLoader->LoadHits("read"); + } + fLoader->LoadDigits("recreate"); - c->SetDetector(det); - c->AddTrackIndex(tracks); + AliRunLoader *runLoader = fLoader->GetRunLoader(); - c->SetQ(amp); + for (Int_t iEvent = 0; iEvent < runLoader->GetNumberOfEvents(); iEvent++) { + runLoader->GetEvent(iEvent); + digitizer.Open(runLoader,iEvent); + digitizer.MakeDigits(); + digitizer.WriteDigits(); + } - c->SetLocalTimeBin(((Int_t) pos[2])); - c->SetY(col0 + padCol * colSize); - c->SetZ(row0 + padRow * rowSize); - - c->SetSigmaY2((sigmaY2 + 1./12.) * colSize*colSize); - c->SetSigmaZ2(rowSize * rowSize / 12.); - - switch (iType) { - case 0: - c->Set2pad(); - break; - case 1: - c->Set3pad(); - break; - case 2: - c->Set4pad(); - break; - case 3: - c->Set5pad(); - break; - case 4: - c->SetLarge(); - break; - }; - - fRecPoints->Add(c); + fLoader->UnloadHits(); + fLoader->UnloadDigits(); } //_____________________________________________________________________________ -void AliTRD::Hits2Digits() +void AliTRD::Hits2SDigits() { // - // Create digits + // Create summable digits // - AliTRDdigitizer *digitizer = new AliTRDdigitizer("TRDdigitizer" - ,"TRD digitizer class"); - digitizer->SetDebug(GetDebug()); - digitizer->SetEvent(gAlice->GetEvNumber()); + AliTRDdigitizer digitizer("TRDdigitizer","TRD digitizer class"); + // For the summable digits + digitizer.SetSDigits(kTRUE); + AliLog::SetClassDebugLevel("TRDdigitizer",AliDebugLevel()); // Initialization - digitizer->InitDetector(); + digitizer.InitDetector(); - // Create the digits - digitizer->MakeDigits(); - - // Write the digits into the input file - if (digitizer->MakeBranch(fDigitsFile)) { - - digitizer->WriteDigits(); + if (!fLoader->TreeH()) { + fLoader->LoadHits("read"); + } + fLoader->LoadSDigits("recreate"); - // Save the digitizer class in the AliROOT - digitizer->Write(); + AliRunLoader *runLoader = fLoader->GetRunLoader(); + for (Int_t iEvent = 0; iEvent < runLoader->GetNumberOfEvents(); iEvent++) { + runLoader->GetEvent(iEvent); + digitizer.Open(runLoader,iEvent); + digitizer.MakeDigits(); + digitizer.WriteDigits(); } + fLoader->UnloadHits(); + fLoader->UnloadSDigits(); + } //_____________________________________________________________________________ -void AliTRD::Hits2SDigits() +AliDigitizer *AliTRD::CreateDigitizer(AliRunDigitizer *manager) const { // - // Create summable digits + // Creates a new digitizer object // - AliTRDdigitizer *digitizer = new AliTRDdigitizer("TRDdigitizer" - ,"TRD digitizer class"); - digitizer->SetDebug(GetDebug()); - - // For the summable digits - digitizer->SetSDigits(kTRUE); - digitizer->SetEvent(gAlice->GetEvNumber()); - - // Initialization - digitizer->InitDetector(); - - // Create the TRD s-digits branch - digitizer->MakeDigits(); - - // Write the digits into the input file - if (digitizer->MakeBranch(fDigitsFile)) { - - digitizer->WriteDigits(); - - // Save the digitizer class in the AliROOT - digitizer->Write(); - - } + return new AliTRDdigitizer(manager); } @@ -424,61 +217,99 @@ void AliTRD::SDigits2Digits() // Create final digits from summable digits // - // Create the TRD digitizer - AliTRDdigitizer *digitizer = new AliTRDdigitizer("TRDdigitizer" - ,"TRD digitizer class"); - digitizer->SetDebug(GetDebug()); + // Create the TRD digitizer + AliTRDdigitizer digitizer("TRDdigitizer","TRD digitizer class"); + AliLog::SetClassDebugLevel("TRDdigitizer",AliDebugLevel()); // Set the parameter - digitizer->SetEvent(gAlice->GetEvNumber()); + digitizer.SetEvent(gAlice->GetEvNumber()); // Initialization - digitizer->InitDetector(); + digitizer.InitDetector(); // Read the s-digits via digits manager - AliTRDdigitsManager *sdigitsManager = new AliTRDdigitsManager(); - sdigitsManager->SetDebug(GetDebug()); - sdigitsManager->SetSDigits(kTRUE); - if (fDigitsFile) { - sdigitsManager->Open(fDigitsFile); + AliTRDdigitsManager sdigitsManager; + + AliLog::SetClassDebugLevel("TRDdigitisManager",AliDebugLevel()); + sdigitsManager.SetSDigits(kTRUE); + sdigitsManager.CreateArrays(); + + if (!fLoader->TreeS()) { + if (fLoader->LoadSDigits("read")) { + return; + } + } + if (!fLoader->TreeS()) { + AliError(Form("Error while reading SDigits for event %d",gAlice->GetEvNumber())); + return; } - sdigitsManager->CreateArrays(); - sdigitsManager->ReadDigits(); + + sdigitsManager.ReadDigits(fLoader->TreeS()); // Add the s-digits to the input list - digitizer->AddSDigitsManager(sdigitsManager); + digitizer.AddSDigitsManager(&sdigitsManager); // Convert the s-digits to normal digits - digitizer->SDigits2Digits(); + digitizer.SDigits2Digits(); // Store the digits - if (digitizer->MakeBranch(fDigitsFile)) { + if (!fLoader->TreeD()) { + fLoader->MakeTree("D"); + } + if (digitizer.MakeBranch(fLoader->TreeD())){ + digitizer.WriteDigits(); + } + +} + +//_____________________________________________________________________________ +void AliTRD::Digits2Raw() +{ + // + // Convert digits of the current event to raw data + // - digitizer->WriteDigits(); + fLoader->LoadDigits(); + TTree *digits = fLoader->TreeD(); + if (!digits) { + AliError("No digits tree"); + return; + } + AliTRDrawData rawWriter; + if (!rawWriter.Digits2Raw(digits)) { + AliError("The raw writer could not load the digits tree"); } + fLoader->UnloadDigits(); + } //_____________________________________________________________________________ void AliTRD::AddHit(Int_t track, Int_t det, Float_t *hits, Int_t q - , Bool_t inDrift) + , Float_t time, Bool_t inDrift) { // // Add a hit for the TRD // - // The data structure is set according to fHitType: - // bit0: standard TClonesArray - // bit1: compressed trackHits structure - // - if (fHitType & 1) { - TClonesArray &lhits = *fHits; - new(lhits[fNhits++]) AliTRDhit(fIshunt,track,det,hits,q); + TClonesArray &lhits = *fHits; + AliTRDhit *hit = new(lhits[fNhits++]) AliTRDhit(fIshunt + ,track + ,det + ,hits + ,q + ,time); + + if (inDrift) { + hit->SetDrift(); + } + else { + hit->SetAmplification(); } - if (fHitType > 1) { - AddHit2(track,det,hits,q,inDrift); + if (q < 0) { + hit->SetTRphoton(); } } @@ -490,11 +321,20 @@ void AliTRD::BuildGeometry() // Create the ROOT TNode geometry for the TRD // - TNode *node, *top; + TNode *node; + TNode *top; TPGON *pgon; - Float_t rmin, rmax; - Float_t zmax1, zmax2; + // The dimensions of the TRD super module + const Float_t kRmin = 291.0; + const Float_t kRmax = 369.0; + const Float_t kZmax1 = 378.35; + const Float_t kZmax2 = 302.0; + + Float_t rmin; + Float_t rmax; + Float_t zmax1; + Float_t zmax2; Int_t iPlan; @@ -506,12 +346,12 @@ void AliTRD::BuildGeometry() if (fDisplayType == 0) { pgon = new TPGON("S_TRD","TRD","void",0,360,AliTRDgeometry::Nsect(),4); - rmin = AliTRDgeometry::Rmin(); - rmax = AliTRDgeometry::Rmax(); - pgon->DefineSection(0,-AliTRDgeometry::Zmax1(),rmax,rmax); - pgon->DefineSection(1,-AliTRDgeometry::Zmax2(),rmin,rmax); - pgon->DefineSection(2, AliTRDgeometry::Zmax2(),rmin,rmax); - pgon->DefineSection(3, AliTRDgeometry::Zmax1(),rmax,rmax); + rmin = kRmin; + rmax = kRmax; + pgon->DefineSection(0,-kZmax1,rmax,rmax); + pgon->DefineSection(1,-kZmax2,rmin,rmax); + pgon->DefineSection(2, kZmax2,rmin,rmax); + pgon->DefineSection(3, kZmax1,rmax,rmax); top->cd(); node = new TNode("TRD","TRD","S_TRD",0,0,0,""); node->SetLineColor(kColorTRD); @@ -522,14 +362,13 @@ void AliTRD::BuildGeometry() Char_t name[7]; - Float_t slope = (AliTRDgeometry::Zmax1() - AliTRDgeometry::Zmax2()) - / (AliTRDgeometry::Rmax() - AliTRDgeometry::Rmin()); + Float_t slope = (kZmax1 - kZmax2) / (kRmax - kRmin); - rmin = AliTRDgeometry::Rmin() + AliTRDgeometry::CraHght(); - rmax = rmin + AliTRDgeometry::CdrHght(); + rmin = kRmin + AliTRDgeometry::CraHght(); + rmax = rmin + AliTRDgeometry::CdrHght(); - Float_t thickness = rmin - AliTRDgeometry::Rmin(); - zmax2 = AliTRDgeometry::Zmax2() + slope * thickness; + Float_t thickness = rmin - kRmin; + zmax2 = kZmax2 + slope * thickness; zmax1 = zmax2 + slope * AliTRDgeometry::DrThick(); for (iPlan = 0; iPlan < AliTRDgeometry::Nplan(); iPlan++) { @@ -554,10 +393,10 @@ void AliTRD::BuildGeometry() } thickness += AliTRDgeometry::DrThick(); - rmin = AliTRDgeometry::Rmin() + thickness; - rmax = rmin + AliTRDgeometry::AmThick(); - zmax2 = AliTRDgeometry::Zmax2() + slope * thickness; - zmax1 = zmax2 + slope * AliTRDgeometry::AmThick(); + rmin = kRmin + thickness; + rmax = rmin + AliTRDgeometry::AmThick(); + zmax2 = kZmax2 + slope * thickness; + zmax1 = zmax2 + slope * AliTRDgeometry::AmThick(); for (iPlan = 0; iPlan < AliTRDgeometry::Nplan(); iPlan++) { @@ -584,27 +423,6 @@ void AliTRD::BuildGeometry() } -//_____________________________________________________________________________ -void AliTRD::Copy(TObject &trd) -{ - // - // Copy function - // - - ((AliTRD &) trd).fGasMix = fGasMix; - ((AliTRD &) trd).fGeometry = fGeometry; - ((AliTRD &) trd).fRecPoints = fRecPoints; - ((AliTRD &) trd).fNRecPoints = fNRecPoints; - ((AliTRD &) trd).fGasDensity = fGasDensity; - ((AliTRD &) trd).fFoilDensity = fFoilDensity; - ((AliTRD &) trd).fDrawTR = fDrawTR; - ((AliTRD &) trd).fDisplayType = fDisplayType; - ((AliTRD &) trd).fHitType = fHitType; - - //AliDetector::Copy(trd); - -} - //_____________________________________________________________________________ void AliTRD::CreateGeometry() { @@ -613,10 +431,9 @@ void AliTRD::CreateGeometry() // // Check that FRAME is there otherwise we have no place where to put the TRD - AliModule* frame = gAlice->GetModule("FRAME"); + AliModule *frame = gAlice->GetModule("FRAME"); if (!frame) { - printf(" The TRD needs the FRAME to be defined first\n"); - return; + AliFatal("The TRD needs the FRAME to be defined first"); } fGeometry->CreateGeometry(fIdtmed->GetArray() - 1299); @@ -628,202 +445,186 @@ void AliTRD::CreateMaterials() { // // Create the materials for the TRD - // Origin Y.Foka // Int_t isxfld = gAlice->Field()->Integ(); Float_t sxmgmx = gAlice->Field()->Max(); // For polyethilene (CH2) - Float_t ape[2] = { 12., 1. }; - Float_t zpe[2] = { 6., 1. }; - Float_t wpe[2] = { 1., 2. }; - Float_t dpe = 0.95; - - // For mylar (C5H4O2) - Float_t amy[3] = { 12., 1., 16. }; - Float_t zmy[3] = { 6., 1., 8. }; - Float_t wmy[3] = { 5., 4., 2. }; - Float_t dmy = 1.39; + Float_t ape[2] = { 12.011 , 1.0079 }; + Float_t zpe[2] = { 6.0 , 1.0 }; + Float_t wpe[2] = { 1.0 , 2.0 }; + Float_t dpe = 0.95; // For CO2 - Float_t aco[2] = { 12., 16. }; - Float_t zco[2] = { 6., 8. }; - Float_t wco[2] = { 1., 2. }; - Float_t dco = 0.001977; + Float_t aco[2] = { 12.011 , 15.9994 }; + Float_t zco[2] = { 6.0 , 8.0 }; + Float_t wco[2] = { 1.0 , 2.0 }; + Float_t dco = 0.00186; // For water - Float_t awa[2] = { 1., 16. }; - Float_t zwa[2] = { 1., 8. }; - Float_t wwa[2] = { 2., 1. }; - Float_t dwa = 1.0; + Float_t awa[2] = { 1.0079, 15.9994 }; + Float_t zwa[2] = { 1.0 , 8.0 }; + Float_t wwa[2] = { 2.0 , 1.0 }; + Float_t dwa = 1.0; // For isobutane (C4H10) - Float_t ais[2] = { 12., 1. }; - Float_t zis[2] = { 6., 1. }; - Float_t wis[2] = { 4., 10. }; - Float_t dis = 0.00267; + Float_t ais[2] = { 12.011 , 1.0079 }; + Float_t zis[2] = { 6.0 , 1.0 }; + Float_t wis[2] = { 4.0 , 10.0 }; + Float_t dis = 0.00267; // For plexiglas (C5H8O2) - Float_t apg[3] = { 12.011 , 1.0 , 15.9994 }; - Float_t zpg[3] = { 6.0 , 1.0 , 8.0 }; - Float_t wpg[3] = { 5.0 , 8.0 , 2.0 }; - Float_t dpg = 1.18; + Float_t apg[3] = { 12.011 , 1.0079, 15.9994 }; + Float_t zpg[3] = { 6.0 , 1.0 , 8.0 }; + Float_t wpg[3] = { 5.0 , 8.0 , 2.0 }; + Float_t dpg = 1.18; + + // For epoxy (C18H19O3) + Float_t aEpoxy[3] = { 15.9994, 1.0079, 12.011 }; + Float_t zEpoxy[3] = { 8.0 , 1.0 , 6.0 }; + Float_t wEpoxy[3] = { 3.0 , 19.0 , 18.0 }; + Float_t dEpoxy = 1.8 ; + + // For Araldite, low density epoxy (C18H19O3) + Float_t aAral[3] = { 15.9994, 1.0079, 12.011 }; + Float_t zAral[3] = { 8.0 , 1.0 , 6.0 }; + Float_t wAral[3] = { 3.0 , 19.0 , 18.0 }; + Float_t dAral = 1.05; + + // For air + Float_t aAir[4] = { 12.011 , 14.0 , 15.9994 , 36.0 }; + Float_t zAir[4] = { 6.0 , 7.0 , 8.0 , 18.0 }; + Float_t wAir[4] = { 0.000124, 0.755267, 0.231781, 0.012827 }; + Float_t dAir = 1.20479e-03; + + // For G10 + Float_t aG10[4] = { 1.0079 , 12.011 , 15.9994 , 28.086 }; + Float_t zG10[4] = { 1.0 , 6.0 , 8.0 , 14.0 }; + Float_t wG10[4] = { 0.15201 , 0.10641 , 0.49444 , 0.24714 }; + Float_t dG10 = 1.7; // For Xe/CO2-gas-mixture + Float_t aXeCO2[3] = { 131.29 , 12.0107 , 15.9994 }; + Float_t zXeCO2[3] = { 54.0 , 6.0 , 8.0 }; + Float_t wXeCO2[3] = { 8.5 , 1.5 , 3.0 }; // Xe-content of the Xe/CO2-mixture (85% / 15%) - Float_t fxc = .85; - // Xe-content of the Xe/Isobutane-mixture (97% / 3%) - Float_t fxi = .97; - Float_t dxe = .005858; + Float_t fxc = 0.85; + Float_t dxe = 0.00549; + Float_t dgm = fxc * dxe + (1.0 - fxc) * dco; // General tracking parameter - Float_t tmaxfd = -10.; - Float_t stemax = -1e10; - Float_t deemax = -0.1; - Float_t epsil = 1e-4; - Float_t stmin = -0.001; - - Float_t absl, radl, d, buf[1]; - Float_t agm[2], zgm[2], wgm[2]; - Float_t dgm1, dgm2; - Int_t nbuf; + Float_t tmaxfd = -10.0; + Float_t stemax = -1.0e10; + Float_t deemax = -0.1; + Float_t epsil = 1.0e-4; + Float_t stmin = -0.001; ////////////////////////////////////////////////////////////////////////// // Define Materials ////////////////////////////////////////////////////////////////////////// AliMaterial( 1, "Al" , 26.98, 13.0, 2.7 , 8.9 , 37.2); - AliMaterial( 2, "Air" , 14.61, 7.3, 0.001205, 30420.0 , 67500.0); - AliMaterial( 4, "Xe" , 131.29, 54.0, dxe , 1447.59, 0.0); + AliMaterial( 4, "Xe" , 131.29, 54.0, dxe , 1546.16, 0.0); AliMaterial( 5, "Cu" , 63.54, 29.0, 8.96 , 1.43, 14.8); AliMaterial( 6, "C" , 12.01, 6.0, 2.265 , 18.8 , 74.4); - AliMaterial(12, "G10" , 20.00, 10.0, 1.7 , 19.4 , 999.0); AliMaterial(15, "Sn" , 118.71, 50.0, 7.31 , 1.21, 14.8); AliMaterial(16, "Si" , 28.09, 14.0, 2.33 , 9.36, 37.2); - AliMaterial(17, "Epoxy", 17.75, 8.9, 1.8 , 21.82, 999.0); + AliMaterial(18, "Fe" , 55.85, 26.0, 7.87 , 1.76, 14.8); // Mixtures - AliMixture(3, "Polyethilene", ape, zpe, dpe, -2, wpe); - AliMixture(7, "Mylar", amy, zmy, dmy, -3, wmy); - AliMixture(8, "CO2", aco, zco, dco, -2, wco); - AliMixture(9, "Isobutane", ais, zis, dis, -2, wis); - AliMixture(13,"Water", awa, zwa, dwa, -2, wwa); - AliMixture(14,"Plexiglas", apg, zpg, dpg, -3, wpg); - - // Gas mixtures - Char_t namate[21]; - // Xe/CO2-mixture - // Get properties of Xe - gMC->Gfmate((*fIdmate)[4], namate, agm[0], zgm[0], d, radl, absl, buf, nbuf); - // Get properties of CO2 - gMC->Gfmate((*fIdmate)[8], namate, agm[1], zgm[1], d, radl, absl, buf, nbuf); - // Create gas mixture - wgm[0] = fxc; - wgm[1] = 1. - fxc; - dgm1 = wgm[0] * dxe + wgm[1] * dco; - AliMixture(10, "Gas mixture 1", agm, zgm, dgm1, 2, wgm); - // Xe/Isobutane-mixture - // Get properties of Xe - gMC->Gfmate((*fIdmate)[4], namate, agm[0], zgm[0], d, radl, absl, buf, nbuf); - // Get properties of Isobutane - gMC->Gfmate((*fIdmate)[9], namate, agm[1], zgm[1], d, radl, absl, buf, nbuf); - // Create gas mixture - wgm[0] = fxi; - wgm[1] = 1. - fxi; - dgm2 = wgm[0] * dxe + wgm[1] * dis; - AliMixture(11, "Gas mixture 2", agm, zgm, dgm2, 2, wgm); - + AliMixture(2, "Air" , aAir, zAir, dAir, 4, wAir ); + AliMixture(3, "Polyethilene", ape, zpe, dpe, -2, wpe ); + AliMixture(8, "CO2", aco, zco, dco, -2, wco ); + AliMixture(9, "Isobutane", ais, zis, dis, -2, wis ); + AliMixture(10,"Gas mixture", aXeCO2, zXeCO2, dgm, -3, wXeCO2); + AliMixture(12,"G10", aG10, zG10, dG10, 4, wG10 ); + AliMixture(13,"Water", awa, zwa, dwa, -2, wwa ); + AliMixture(14,"Plexiglas", apg, zpg, dpg, -3, wpg ); + AliMixture(17,"Epoxy", aEpoxy, zEpoxy, dEpoxy, -3, wEpoxy); + AliMixture(19,"Araldite", aAral, zAral, dAral, -3, wAral ); + ////////////////////////////////////////////////////////////////////////// // Tracking Media Parameters ////////////////////////////////////////////////////////////////////////// // Al Frame - AliMedium(1, "Al Frame", 1, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium( 1,"Al Frame" , 1,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Air - AliMedium(2, "Air", 2, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); - // Polyethilene - AliMedium(3, "Radiator", 3, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); - // Xe - AliMedium(4, "Xe", 4, 1, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium( 2,"Air" , 2,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); + // Wires + AliMedium( 3,"Wires" , 5,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); + // All other ROB materials (caps, etc.) + AliMedium( 4,"ROB Other" , 5,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Cu pads - AliMedium(5, "Padplane", 5, 1, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium( 5,"Padplane" , 5,1,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Fee + cables - AliMedium(6, "Readout", 1, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium( 6,"Readout" , 5,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // C frame - AliMedium(7, "C Frame", 6, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); - // Mylar foils - AliMedium(8, "Mylar", 7, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); - if (fGasMix == 1) { - // Gas-mixture (Xe/CO2) - AliMedium(9, "Gas-mix", 10, 1, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); - } - else { - // Gas-mixture (Xe/Isobutane) - AliMedium(9, "Gas-mix", 11, 1, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); - } - // Nomex-honeycomb (use carbon for the time being) - AliMedium(10, "Nomex", 6, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); - // Kapton foils (use Mylar for the time being) - AliMedium(11, "Kapton", 7, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); - // Gas-filling of the radiator - AliMedium(12, "CO2", 8, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium( 7,"C Frame" , 6,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); + // INOX of cooling bus bars + AliMedium( 8,"Cooling bus",18,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); + // Gas-mixture (Xe/CO2) + AliMedium( 9,"Gas-mix" ,10,1,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); + // Nomex-honeycomb + AliMedium(10,"Nomex" ,12,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); + // Araldite glue + AliMedium(11,"Glue" ,19,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // G10-plates - AliMedium(13, "G10-plates",12, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(13,"G10-plates" ,12,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Cooling water - AliMedium(14, "Water", 13, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(14,"Water" ,13,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Rohacell (plexiglas) for the radiator - AliMedium(15, "Rohacell", 14, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(15,"Rohacell" ,14,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Al layer in MCMs - AliMedium(16, "MCM-Al" , 1, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(16,"MCM-Al" , 1,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Sn layer in MCMs - AliMedium(17, "MCM-Sn" , 15, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(17,"MCM-Sn" ,15,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Cu layer in MCMs - AliMedium(18, "MCM-Cu" , 5, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(18,"MCM-Cu" , 5,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // G10 layer in MCMs - AliMedium(19, "MCM-G10" , 12, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(19,"MCM-G10" ,12,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Si in readout chips - AliMedium(20, "Chip-Si" , 16, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(20,"Chip-Si" ,16,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Epoxy in readout chips - AliMedium(21, "Chip-Ep" , 17, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(21,"Chip-Ep" ,17,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // PE in connectors - AliMedium(22, "Conn-PE" , 3, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(22,"Conn-PE" , 3,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Cu in connectors - AliMedium(23, "Chip-Cu" , 5, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(23,"Chip-Cu" , 5,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Al of cooling pipes - AliMedium(24, "Cooling" , 1, 0, isxfld, sxmgmx - , tmaxfd, stemax, deemax, epsil, stmin); + AliMedium(24,"Cooling" , 1,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); + // Cu in services + AliMedium(25,"Serv-Cu" , 5,0,isxfld,sxmgmx + ,tmaxfd,stemax,deemax,epsil,stmin); // Save the density values for the TRD absorbtion + Float_t dmy = 1.39; fFoilDensity = dmy; - if (fGasMix == 1) - fGasDensity = dgm1; - else - fGasDensity = dgm2; + fGasDensity = dgm; } @@ -862,17 +663,7 @@ void AliTRD::DrawModule() const gMC->Gsatt("BTR2","SEEN", 0); gMC->Gsatt("BTR3","SEEN", 0); gMC->Gsatt("UTR1","SEEN", 0); - if (fGeometry->GetPHOShole()) - gMC->Gsatt("UTR2","SEEN", 0); - if (fGeometry->GetRICHhole()) - gMC->Gsatt("UTR3","SEEN", 0); } -// gMC->Gsatt("UCII","SEEN", 0); -// gMC->Gsatt("UCIM","SEEN", 0); -// gMC->Gsatt("UCIO","SEEN", 0); -// gMC->Gsatt("UL02","SEEN", 1); -// gMC->Gsatt("UL05","SEEN", 1); -// gMC->Gsatt("UL06","SEEN", 1); gMC->Gdopt("hide", "on"); gMC->Gdopt("shad", "on"); @@ -887,11 +678,12 @@ void AliTRD::DrawModule() const } //_____________________________________________________________________________ -Int_t AliTRD::DistancetoPrimitive(Int_t , Int_t ) const +Int_t AliTRD::DistancetoPrimitive(Int_t , Int_t ) { // // Distance between the mouse and the TRD detector on the screen // Dummy routine + // return 9999; @@ -904,62 +696,42 @@ void AliTRD::Init() // Initialize the TRD detector after the geometry has been created // - Int_t i; + AliDebug(1,"++++++++++++++++++++++++++++++++++++++++++++++"); - if (fDebug) { - printf("\n%s: ",ClassName()); - for (i = 0; i < 35; i++) printf("*"); - printf(" TRD_INIT "); - for (i = 0; i < 35; i++) printf("*"); - printf("\n"); + if (fGeometry->IsVersion() != 1) { + AliError("Not a valid geometry"); } - if (fGeometry->IsVersion() == 0) { - printf("%s: Geometry for spaceframe with holes initialized\n",ClassName()); - } - else if (fGeometry->IsVersion() == 1) { - printf("%s: Geometry for spaceframe without holes initialized\n",ClassName()); - if (fGeometry->GetPHOShole()) - printf("%s: Leave space in front of PHOS free\n",ClassName()); - if (fGeometry->GetRICHhole()) - printf("%s: Leave space in front of RICH free\n",ClassName()); - } - - if (fGasMix == 1) { - printf("%s: Gas Mixture: 85%% Xe + 15%% CO2\n",ClassName()); - } - else { - printf("%s: Gas Mixture: 97%% Xe + 3%% Isobutane\n",ClassName()); - } + // Special tracking options for charged particles for XeCO2 + gMC->Gstpar((* fIdtmed)[9],"DRAY" , 1.0); + gMC->Gstpar((* fIdtmed)[9],"STRA" , 1.0); + gMC->Gstpar((* fIdtmed)[9],"LOSS" ,13.0); // Specific energy loss + gMC->Gstpar((* fIdtmed)[9],"PRIMIO_E",23.53); // 1st ionisation potential + gMC->Gstpar((* fIdtmed)[9],"PRIMIO_N",19.344431); // Number of primaries } //_____________________________________________________________________________ -void AliTRD::LoadPoints(Int_t track) +void AliTRD::LoadPoints(Int_t ) { // // Store x, y, z of all hits in memory. // Hit originating from TR photons are given a different color // - //if (!fDrawTR) { - // AliDetector::LoadPoints(track); - // return; - //} - - if ((fHits == 0) && (fTrackHits == 0)) return; + if (fHits == 0) { + return; + } - Int_t nhits; - if (fHitType < 2) { - nhits = fHits->GetEntriesFast(); + Int_t nhits = fHits->GetEntriesFast(); + if (nhits == 0) { + return; } - else { - nhits = fTrackHits->GetEntriesFast(); - } - if (nhits == 0) return; - Int_t tracks = gAlice->GetNtrack(); - if (fPoints == 0) fPoints = new TObjArray(tracks); + Int_t tracks = gAlice->GetMCApp()->GetNtrack(); + if (fPoints == 0) { + fPoints = new TObjArray(tracks); + } AliTRDhit *ahit; @@ -1011,7 +783,8 @@ void AliTRD::LoadPoints(Int_t track) } // TR photon hits - else if ((ahit->GetCharge() < 0) && (fDrawTR)) { + else if ((ahit->GetCharge() < 0) && + (fDrawTR)) { trk = ahit->GetTrack(); if (ntrkT[trk] == limiT[trk]) { @@ -1048,9 +821,9 @@ void AliTRD::LoadPoints(Int_t track) // Set the dEdx points if (ntrkE[trk]) { - points->SetMarkerColor(GetMarkerColor()); - points->SetMarkerSize(GetMarkerSize()); - points->SetPolyMarker(ntrkE[trk],coorE[trk],GetMarkerStyle()); + points->SetMarkerColor(kWhite); //PH This is the default color in TRD + points->SetMarkerSize(1); //PH Default size=1 + points->SetPolyMarker(ntrkE[trk],coorE[trk],1); //PH Default style=1 delete [] coorE[trk]; coorE[trk] = 0; } @@ -1078,7 +851,7 @@ void AliTRD::LoadPoints(Int_t track) } //_____________________________________________________________________________ -void AliTRD::MakeBranch(Option_t* option, const char *file) +void AliTRD::MakeBranch(Option_t *option) { // // Create Tree branches for the TRD digits. @@ -1088,16 +861,14 @@ void AliTRD::MakeBranch(Option_t* option, const char *file) Char_t branchname[15]; sprintf(branchname,"%s",GetName()); - const char *cD = strstr(option,"D"); + const Char_t *cD = strstr(option,"D"); - AliDetector::MakeBranch(option,file); + AliDetector::MakeBranch(option); - if (fDigits && gAlice->TreeD() && cD) { - MakeBranchInTree(gAlice->TreeD(),branchname,&fDigits,buffersize,file); - } - - if (fHitType > 1) { - MakeBranch2(option,file); + if (fDigits && + gAlice->TreeD() && + cD) { + MakeBranchInTree(gAlice->TreeD(),branchname,&fDigits,buffersize,0); } } @@ -1110,21 +881,9 @@ void AliTRD::ResetDigits() // fNdigits = 0; - if (fDigits) fDigits->Clear(); - -} - -//_____________________________________________________________________________ -void AliTRD::ResetRecPoints() -{ - // - // Reset number of reconstructed points and the point array - // - if (fRecPoints) { - fNRecPoints = 0; - Int_t nentr = fRecPoints->GetEntriesFast(); - for (Int_t i = 0; i < nentr; i++) delete fRecPoints->RemoveAt(i); + if (fDigits) { + fDigits->Clear(); } } @@ -1136,648 +895,59 @@ void AliTRD::SetTreeAddress() // Set the branch addresses for the trees. // - Char_t branchname[15]; - - AliDetector::SetTreeAddress(); - - TBranch *branch; - TTree *treeR = gAlice->TreeR(); - - if (treeR) { - sprintf(branchname,"%scluster",GetName()); - if (fRecPoints) { - branch = treeR->GetBranch(branchname); - if (branch) { - branch->SetAddress(&fRecPoints); - } - } - } - - if (fHitType > 0) { - SetTreeAddress2(); - } - -} - -//_____________________________________________________________________________ -void AliTRD::SetGasMix(Int_t imix) -{ - // - // Defines the gas mixture (imix=0: Xe/Isobutane imix=1: Xe/CO2) - // - - if ((imix < 0) || (imix > 1)) { - printf("Wrong input value: %d\n",imix); - printf("Use standard setting\n"); - fGasMix = 1; - return; - } - - fGasMix = imix; - -} - -//_____________________________________________________________________________ -void AliTRD::SetPHOShole() -{ - // - // Selects a geometry with a hole in front of the PHOS - // - - fGeometry->SetPHOShole(); - -} - -//_____________________________________________________________________________ -void AliTRD::SetRICHhole() -{ - // - // Selects a geometry with a hole in front of the RICH - // - - fGeometry->SetRICHhole(); - -} - -//_____________________________________________________________________________ -AliTRD &AliTRD::operator=(const AliTRD &trd) -{ - // - // Assignment operator - // - - if (this != &trd) ((AliTRD &) trd).Copy(*this); - return *this; - -} - -//_____________________________________________________________________________ -void AliTRD::FinishPrimary() -{ - // - // Store the hits in the containers after all primaries are finished - // - - if (fTrackHits) { - fTrackHits->FlushHitStack(); + if (fLoader->TreeH() && + (fHits == 0x0)) { + fHits = new TClonesArray("AliTRDhit",405); } + AliDetector::SetTreeAddress(); } //_____________________________________________________________________________ -void AliTRD::RemapTrackHitIDs(Int_t *map) +Bool_t AliTRD::Raw2SDigits(AliRawReader *rawReader) { // - // Remap the track IDs + // Converts RAW data to SDigits // - if (!fTrackHits) { - return; - } - - if (fTrackHits) { - TClonesArray *arr = fTrackHits->GetArray();; - for (Int_t i = 0; i < arr->GetEntriesFast(); i++){ - AliTrackHitsParamV2 *info = (AliTrackHitsParamV2 *) (arr->At(i)); - info->fTrackID = map[info->fTrackID]; - } + AliLoader *loader = fRunLoader->GetLoader("TRDLoader"); + if (!loader) { + AliError("Can not get TRD loader from Run Loader"); + return kFALSE; } - -} - -//_____________________________________________________________________________ -void AliTRD::ResetHits() -{ - // - // Reset the hits - // - - AliDetector::ResetHits(); - if (fTrackHits) { - fTrackHits->Clear(); + + TTree *tree = 0; + tree = loader->TreeS(); + if (!tree) { + loader->MakeTree("S"); + tree = loader->TreeS(); + } + + AliTRDrawData *rawdata = new AliTRDrawData(); + AliTRDdigitsManager *sdigitsManager = rawdata->Raw2Digits(rawReader); + if (sdigitsManager) { + sdigitsManager->SetSDigits(kTRUE); + sdigitsManager->MakeBranch(tree); + sdigitsManager->WriteDigits(); + return kTRUE; + } + else { + return kFALSE; } } //_____________________________________________________________________________ -AliHit* AliTRD::FirstHit(Int_t track) +AliTRD &AliTRD::operator=(const AliTRD &trd) { // - // Return the first hit of a track + // Assignment operator // - if (fHitType > 1) { - return FirstHit2(track); + if (this != &trd) { + ((AliTRD &) trd).Copy(*this); } - return AliDetector::FirstHit(track); + return *this; } - -//_____________________________________________________________________________ -AliHit* AliTRD::NextHit() -{ - // - // Returns the next hit of a track - // - - if (fHitType > 1) { - return NextHit2(); - } - - return AliDetector::NextHit(); - -} - -//_____________________________________________________________________________ -AliHit* AliTRD::FirstHit2(Int_t track) -{ - // - // Initializes the hit iterator. - // Returns the address of the first hit of a track. - // If >= 0 the track is read from disk, - // while if < 0 the first hit of the current - // track is returned. - // - - if (track >= 0) { - gAlice->ResetHits(); - gAlice->TreeH()->GetEvent(track); - } - - if (fTrackHits) { - fTrackHits->First(); - return (AliHit*) fTrackHits->GetHit(); - } - else { - return 0; - } - -} - -//_____________________________________________________________________________ -AliHit* AliTRD::NextHit2() -{ - // - // Returns the next hit of the current track - // - - if (fTrackHits) { - fTrackHits->Next(); - return (AliHit *) fTrackHits->GetHit(); - } - else { - return 0; - } - -} - -//_____________________________________________________________________________ -void AliTRD::MakeBranch2(Option_t *option, const char *file) -{ - // - // Create a new branch in the current Root tree. - // The branch of fHits is automatically split. - // - - if (fHitType < 2) { - return; - } - - char branchname[10]; - sprintf(branchname,"%s2",GetName()); - - // Get the pointer to the header - const char *cH = strstr(option,"H"); - - if (!fTrackHits) { - fTrackHits = new AliTRDtrackHits(); - } - - if (fTrackHits && gAlice->TreeH() && cH) { - - gAlice->TreeH()->Branch(branchname,"AliTRDtrackHits" - ,&fTrackHits - ,fBufferSize,99); - - if (GetDebug() > 1) { - printf(" Making Branch %s for trackhits\n" - ,branchname); - } - - const char kFolder[] = "RunMC/Event/Data"; - - if (GetDebug()) { - printf(" %15s: Publishing %s to %s\n" - ,ClassName(),branchname,kFolder); - } - - Publish(kFolder,&fTrackHits,branchname); - - if (file) { - TBranch *b = gAlice->TreeH()->GetBranch(branchname); - TDirectory *wd = gDirectory; - b->SetFile(file); - TIter next(b->GetListOfBranches()); - while ((b = (TBranch*) next())) { - b->SetFile(file); - } - wd->cd(); - if (GetDebug() > 1) { - printf(" Diverting branch %s to file %s\n" - ,branchname,file); - } - } - - } - -} - -//_____________________________________________________________________________ -void AliTRD::SetTreeAddress2() -{ - // - // Set the branch address for the trackHits tree - // - - TBranch *branch; - - char branchname[20]; - - sprintf(branchname,"%s2",GetName()); - - // Branch address for hit tree - TTree *treeH = gAlice->TreeH(); - if ((treeH) && (fHitType > 0)) { - branch = treeH->GetBranch(branchname); - if (branch) { - branch->SetAddress(&fTrackHits); - } - } - -} - -//_____________________________________________________________________________ -void AliTRD::AddHit2(Int_t track, Int_t det, Float_t *hits, Int_t q - , Bool_t inDrift) -{ - // - // Add a hit to the list - // - - Int_t rtrack; - - if (fIshunt) { - Int_t primary = gAlice->GetPrimary(track); - gAlice->Particle(primary)->SetBit(kKeepBit); - rtrack = primary; - } - else { - rtrack = track; - gAlice->FlagTrack(track); - } - - if ((fTrackHits) && (fHitType > 0)) { - fTrackHits->AddHitTRD(det,rtrack,hits[0],hits[1],hits[2],q,inDrift); - } - -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -