From e6add757c973cedee4d7a8a5abaeb31157fa026a Mon Sep 17 00:00:00 2001 From: morsch Date: Fri, 27 Jul 2007 08:15:22 +0000 Subject: [PATCH] Write all track references into the same branch. --- ITS/AliITSv11.cxx | 5 +---- ITS/AliITSv11Hybrid.cxx | 9 ++++----- ITS/AliITSvPPRasymmFMD.cxx | 6 +----- MUON/AliMUONv1.cxx | 2 +- STRUCT/AliFRAMEv2.cxx | 7 +++++-- TOF/AliTOFv4T0.cxx | 3 ++- TOF/AliTOFv5T0.cxx | 6 +++++- TOF/AliTOFv6T0.cxx | 6 +++++- TPC/AliTPCv2.cxx | 3 ++- TPC/AliTPCv4.cxx | 6 +++++- TRD/AliTRDv1.cxx | 13 +++++++------ 11 files changed, 38 insertions(+), 28 deletions(-) diff --git a/ITS/AliITSv11.cxx b/ITS/AliITSv11.cxx index 27f5dc983e6..461e0cc3b24 100644 --- a/ITS/AliITSv11.cxx +++ b/ITS/AliITSv11.cxx @@ -1686,10 +1686,7 @@ void AliITSv11::StepManager(){ Bool_t sensvol = kFALSE; for(Int_t kk=0;kk<6;kk++)if(id == fIdSens[kk])sensvol=kTRUE; if(sensvol && (gMC->IsTrackExiting())){ - copy = fTrackReferences->GetEntriesFast(); - TClonesArray &lTR = *fTrackReferences; - // Fill TrackReference structure with this new TrackReference. - new(lTR[copy]) AliTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kITS); } // if Outer ITS mother Volume diff --git a/ITS/AliITSv11Hybrid.cxx b/ITS/AliITSv11Hybrid.cxx index ef59b129afd..c2efa93a7fa 100644 --- a/ITS/AliITSv11Hybrid.cxx +++ b/ITS/AliITSv11Hybrid.cxx @@ -16,6 +16,9 @@ // $Id$ // $Log$ +// Revision 1.5 2007/06/28 10:17:25 masera +// Introduction of the new SSD geometry in simulation (AliITSv11Hybrid) and suppression of overlaps between old and new parts +// // Revision 1.4 2007/05/09 20:40:41 masera // Bug fix (V11Hybrid geometry) // @@ -5589,11 +5592,7 @@ void AliITSv11Hybrid::StepManager(){ if (notSens) return; if(gMC->IsTrackExiting()) { - copy = fTrackReferences->GetEntriesFast(); - TClonesArray &lTR = *fTrackReferences; - // Fill TrackReference structure with this new TrackReference. - new(lTR[copy]) AliTrackReference( - gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kITS); } // if Outer ITS mother Volume static TLorentzVector position, momentum; // Saves on calls to construtors diff --git a/ITS/AliITSvPPRasymmFMD.cxx b/ITS/AliITSvPPRasymmFMD.cxx index b2a1de43d55..a81fe1c67af 100644 --- a/ITS/AliITSvPPRasymmFMD.cxx +++ b/ITS/AliITSvPPRasymmFMD.cxx @@ -6282,11 +6282,7 @@ void AliITSvPPRasymmFMD::StepManager(){ if(!sensvol) return; // not an ITS tracking volume; if(gMC->IsTrackExiting()){ - copy = fTrackReferences->GetEntriesFast(); - TClonesArray &lTR = *fTrackReferences; - // Fill TrackReference structure with this new TrackReference. - new(lTR[copy]) AliTrackReference( - gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kITS); } // if Outer ITS mother Volume static TLorentzVector position, momentum; // Saves on calls to construtors diff --git a/MUON/AliMUONv1.cxx b/MUON/AliMUONv1.cxx index d6004d6b5c8..078893a844c 100644 --- a/MUON/AliMUONv1.cxx +++ b/MUON/AliMUONv1.cxx @@ -284,7 +284,7 @@ void AliMUONv1::StepManager() // Filling TrackRefs file for MUON. Our Track references are the active volume of the chambers if ( (gMC->IsTrackEntering() || gMC->IsTrackExiting() ) ) { AliTrackReference* trackReference - = AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + = AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kMUON); trackReference->SetUserId(detElemId); } diff --git a/STRUCT/AliFRAMEv2.cxx b/STRUCT/AliFRAMEv2.cxx index 82fe7515d76..3a5a2f72d56 100644 --- a/STRUCT/AliFRAMEv2.cxx +++ b/STRUCT/AliFRAMEv2.cxx @@ -31,6 +31,7 @@ #include "AliConst.h" #include "AliMC.h" #include "AliLog.h" +#include "AliTrackReference.h" ClassImp(AliFRAMEv2) @@ -836,12 +837,14 @@ void AliFRAMEv2::CreateGeometry() // // Thermal shield // + Float_t dyM = 99.0 - 4.; MakeHeatScreen("M", dyM, idrotm[2090], idrotm[2091]); Float_t dyAM = 119.5 - 4.; MakeHeatScreen("AM", dyAM, idrotm[2090], idrotm[2091]); Float_t dyA = 128.0 - 4.; MakeHeatScreen("A" , dyA, idrotm[2090], idrotm[2091]); + // // // @@ -862,7 +865,7 @@ void AliFRAMEv2::CreateGeometry() gMC->Gspos("BTSH_A" , i+19, nameMo, 0., -dy, dz, 0, "ONLY"); } - + // // TRD mother volumes // @@ -1350,7 +1353,7 @@ void AliFRAMEv2::StepManager() // // Add the reference track // - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kFRAME); } diff --git a/TOF/AliTOFv4T0.cxx b/TOF/AliTOFv4T0.cxx index 1b528efa55b..c3cba263b11 100644 --- a/TOF/AliTOFv4T0.cxx +++ b/TOF/AliTOFv4T0.cxx @@ -48,6 +48,7 @@ #include "AliMagF.h" #include "AliMC.h" #include "AliRun.h" +#include "AliTrackReference.h" #include "AliTOFGeometry.h" #include "AliTOFGeometryV4.h" @@ -1121,7 +1122,7 @@ void AliTOFv4T0::StepManager() AliMC *mcApplication = (AliMC*)gAlice->GetMCApp(); - AddTrackReference(mcApplication->GetCurrentTrackNumber()); + AddTrackReference(mcApplication->GetCurrentTrackNumber(), AliTrackReference::kTOF); //AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); // getting information about hit volumes diff --git a/TOF/AliTOFv5T0.cxx b/TOF/AliTOFv5T0.cxx index a77223aadbf..7bb272afe60 100644 --- a/TOF/AliTOFv5T0.cxx +++ b/TOF/AliTOFv5T0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.17 2007/05/14 14:41:13 decaro +Fix a bug in FTOA volume positionig inside BTOF13,14,15,16,17 in case of holes in 11th and 12th sectors + Revision 1.16 2007/05/04 12:59:26 arcelli Change the TOF SM paths for misalignment (one layer up) @@ -106,6 +109,7 @@ Revision 0.1 2004 November G. Cara Romeo and A. De Caro #include "AliMagF.h" #include "AliMC.h" #include "AliRun.h" +#include "AliTrackReference.h" #include "AliTOFGeometry.h" #include "AliTOFGeometryV5.h" @@ -1532,7 +1536,7 @@ void AliTOFv5T0::StepManager() AliMC *mcApplication = (AliMC*)gAlice->GetMCApp(); - AddTrackReference(mcApplication->GetCurrentTrackNumber()); + AddTrackReference(mcApplication->GetCurrentTrackNumber(), AliTrackReference::kTOF); //AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); // getting information about hit volumes diff --git a/TOF/AliTOFv6T0.cxx b/TOF/AliTOFv6T0.cxx index a8b4d71e6e6..2c2dd7009f2 100644 --- a/TOF/AliTOFv6T0.cxx +++ b/TOF/AliTOFv6T0.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.4 2007/05/29 16:51:05 decaro +Update of the front-end electronics and cooling system description + Revision 1.3.2 2007/05/29 decaro FEA+cooling zone description: update FEA+cooling orientation (side A/ side C) -> correction @@ -77,6 +80,7 @@ Revision 0.1 2007 March G. Cara Romeo and A. De Caro #include "AliMagF.h" #include "AliMC.h" #include "AliRun.h" +#include "AliTrackReference.h" #include "AliTOFGeometry.h" #include "AliTOFGeometryV5.h" @@ -1645,7 +1649,7 @@ void AliTOFv6T0::StepManager() AliMC *mcApplication = (AliMC*)gAlice->GetMCApp(); - AddTrackReference(mcApplication->GetCurrentTrackNumber()); + AddTrackReference(mcApplication->GetCurrentTrackNumber(), AliTrackReference::kTOF); //AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); // getting information about hit volumes diff --git a/TPC/AliTPCv2.cxx b/TPC/AliTPCv2.cxx index d5d1428217b..397d9327793 100644 --- a/TPC/AliTPCv2.cxx +++ b/TPC/AliTPCv2.cxx @@ -35,6 +35,7 @@ #include #include #include "AliLog.h" +#include "AliTrackReference.h" #include "AliTPCParam.h" #include "AliTPCTrackHitsV2.h" #include "AliTPCv2.h" @@ -1225,7 +1226,7 @@ void AliTPCv2::StepManager() if(sector != fSecOld){ fSecOld=sector; // add track reference - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTPC); } // track is in the sensitive strip if(id == fIdSens){ diff --git a/TPC/AliTPCv4.cxx b/TPC/AliTPCv4.cxx index 66b9eeac25c..6daf3bdf658 100644 --- a/TPC/AliTPCv4.cxx +++ b/TPC/AliTPCv4.cxx @@ -15,6 +15,9 @@ /* $Log$ +Revision 1.1 2007/06/24 20:56:19 hristov +TPC version for the krypton runs (Marek) + */ // @@ -38,6 +41,7 @@ $Log$ #include #include #include "AliLog.h" +#include "AliTrackReference.h" #include "AliTPCParam.h" #include "AliTPCTrackHitsV2.h" #include "AliTPCv4.h" @@ -1228,7 +1232,7 @@ void AliTPCv4::StepManager() if(sector != fSecOld){ fSecOld=sector; // add track reference - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTPC); } // track is in the sensitive strip if(id == fIdSens){ diff --git a/TRD/AliTRDv1.cxx b/TRD/AliTRDv1.cxx index 420f7a38fe7..7f7534541b5 100644 --- a/TRD/AliTRDv1.cxx +++ b/TRD/AliTRDv1.cxx @@ -34,6 +34,7 @@ #include "AliConst.h" #include "AliLog.h" +#include "AliTrackReference.h" #include "AliMC.h" #include "AliRun.h" @@ -529,7 +530,7 @@ void AliTRDv1::StepManagerGeant() // Create a track reference at the entrance of each // chamber that contains the momentum components of the particle gMC->TrackMomentum(mom); - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTRD); // Create the hits from TR photons if electron/positron is // entering the drift volume @@ -545,7 +546,7 @@ void AliTRDv1::StepManagerGeant() // Create a track reference at the exit of each // chamber that contains the momentum components of the particle gMC->TrackMomentum(mom); - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTRD); } @@ -776,7 +777,7 @@ void AliTRDv1::StepManagerErmilova() // Create a track reference at the entrance of each // chamber that contains the momentum components of the particle gMC->TrackMomentum(mom); - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTRD); // Create the hits from TR photons if electron/positron is // entering the drift volume @@ -792,7 +793,7 @@ void AliTRDv1::StepManagerErmilova() // Create a track reference at the exit of each // chamber that contains the momentum components of the particle gMC->TrackMomentum(mom); - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTRD); } @@ -971,7 +972,7 @@ void AliTRDv1::StepManagerFixedStep() // Create a track reference at the entrance of each // chamber that contains the momentum components of the particle gMC->TrackMomentum(mom); - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTRD); trkStat = 1; // Create the hits from TR photons if electron/positron is @@ -988,7 +989,7 @@ void AliTRDv1::StepManagerFixedStep() // Create a track reference at the exit of each // chamber that contains the momentum components of the particle gMC->TrackMomentum(mom); - AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber()); + AddTrackReference(gAlice->GetMCApp()->GetCurrentTrackNumber(), AliTrackReference::kTRD); trkStat = 2; } -- 2.43.0