| Geant4 Cross Reference |
1 // 1 //
2 // ******************************************* 2 // ********************************************************************
3 // * License and Disclaimer 3 // * License and Disclaimer *
4 // * 4 // * *
5 // * The Geant4 software is copyright of th 5 // * The Geant4 software is copyright of the Copyright Holders of *
6 // * the Geant4 Collaboration. It is provided 6 // * the Geant4 Collaboration. It is provided under the terms and *
7 // * conditions of the Geant4 Software License 7 // * conditions of the Geant4 Software License, included in the file *
8 // * LICENSE and available at http://cern.ch/ 8 // * LICENSE and available at http://cern.ch/geant4/license . These *
9 // * include a list of copyright holders. 9 // * include a list of copyright holders. *
10 // * 10 // * *
11 // * Neither the authors of this software syst 11 // * Neither the authors of this software system, nor their employing *
12 // * institutes,nor the agencies providing fin 12 // * institutes,nor the agencies providing financial support for this *
13 // * work make any representation or warran 13 // * work make any representation or warranty, express or implied, *
14 // * regarding this software system or assum 14 // * regarding this software system or assume any liability for its *
15 // * use. Please see the license in the file 15 // * use. Please see the license in the file LICENSE and URL above *
16 // * for the full disclaimer and the limitatio 16 // * for the full disclaimer and the limitation of liability. *
17 // * 17 // * *
18 // * This code implementation is the result 18 // * This code implementation is the result of the scientific and *
19 // * technical work of the GEANT4 collaboratio 19 // * technical work of the GEANT4 collaboration. *
20 // * By using, copying, modifying or distri 20 // * By using, copying, modifying or distributing the software (or *
21 // * any work based on the software) you ag 21 // * any work based on the software) you agree to acknowledge its *
22 // * use in resulting scientific publicati 22 // * use in resulting scientific publications, and indicate your *
23 // * acceptance of all terms of the Geant4 Sof 23 // * acceptance of all terms of the Geant4 Software license. *
24 // ******************************************* 24 // ********************************************************************
25 // 25 //
26 /// \file SteppingAction.cc 26 /// \file SteppingAction.cc
27 /// \brief Implementation of the SteppingActio 27 /// \brief Implementation of the SteppingAction class
28 // 28 //
29 // 29 //
30 30
31 //....oooOO0OOooo........oooOO0OOooo........oo 31 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
32 //....oooOO0OOooo........oooOO0OOooo........oo 32 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
33 33
34 #include "SteppingAction.hh" 34 #include "SteppingAction.hh"
35 << 35 #include "G4Track.hh"
36 #include "Run.hh" << 36 #include "G4Step.hh"
37 <<
38 #include "G4IonTable.hh" <<
39 #include "G4LossTableManager.hh" <<
40 #include "G4ParticleDefinition.hh" 37 #include "G4ParticleDefinition.hh"
41 #include "G4ParticleTypes.hh" 38 #include "G4ParticleTypes.hh"
42 #include "G4Step.hh" << 39 #include "G4IonTable.hh"
43 #include "G4StepPoint.hh" 40 #include "G4StepPoint.hh"
44 #include "G4SystemOfUnits.hh" <<
45 #include "G4TouchableHistory.hh" <<
46 #include "G4Track.hh" <<
47 #include "G4VPhysicalVolume.hh" 41 #include "G4VPhysicalVolume.hh"
48 #include "G4VSolid.hh" <<
49 #include "G4VTouchable.hh" 42 #include "G4VTouchable.hh"
>> 43 #include "G4TouchableHistory.hh"
>> 44 #include "G4VSolid.hh"
>> 45 #include "G4LossTableManager.hh"
>> 46 #include "G4SystemOfUnits.hh"
>> 47 #include "Run.hh"
50 48
51 const std::array<G4String, SteppingAction::fkN << 49 const std::array< G4String, SteppingAction::fkNumberScoringShells >
52 SteppingAction::fkArrayScoringShellNames = { << 50 SteppingAction::fkArrayScoringShellNames = { "tracker", "emCalo", "hadCalo" };
53 51
54 const std::array<G4String, SteppingAction::fkN << 52 const std::array< G4String, SteppingAction::fkNumberKinematicRegions >
55 SteppingAction::fkArrayKinematicRegionNames << 53 SteppingAction::fkArrayKinematicRegionNames = { "", "below 20 MeV", "above 20 MeV" };
56 54
57 const std::array<G4String, SteppingAction::fkN << 55 const std::array< G4String, SteppingAction::fkNumberScoringPositions >
58 SteppingAction::fkArrayScoringPositionNames << 56 SteppingAction::fkArrayScoringPositionNames = { "forward", "backward" };
59 57
60 const std::array<G4String, SteppingAction::fkN << 58 const std::array< G4String, SteppingAction::fkNumberParticleTypes >
61 SteppingAction::fkArrayParticleTypeNames = { << 59 SteppingAction::fkArrayParticleTypeNames = { "all", "electron", "gamma", "muon", "neutrino",
62 << 60 "pion", "neutron", "proton", "ion", "otherMeson",
63 << 61 "otherBaryon" };
64 62
65 //....oooOO0OOooo........oooOO0OOooo........oo 63 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
66 64
67 G4int SteppingAction::GetIndex(const G4int iSc << 65 G4int SteppingAction::GetIndex( const G4int iScoringShell, const G4int iKinematicRegion,
68 const G4int iSc << 66 const G4int iScoringPosition, const G4int iParticleType ) {
69 { <<
70 G4int index = -1; 67 G4int index = -1;
71 if (iScoringShell >= 0 && iScoringShell < fk << 68 if ( iScoringShell >= 0 && iScoringShell < fkNumberScoringShells &&
72 && iKinematicRegion < fkNumberKinematicR << 69 iKinematicRegion >= 0 && iKinematicRegion < fkNumberKinematicRegions &&
73 && iScoringPosition < fkNumberScoringPos << 70 iScoringPosition >= 0 && iScoringPosition < fkNumberScoringPositions &&
74 && iParticleType < fkNumberParticleTypes << 71 iParticleType >= 0 && iParticleType < fkNumberParticleTypes ) {
75 { << 72 index = iScoringShell * fkNumberKinematicRegions * fkNumberScoringPositions *
76 index = << 73 fkNumberParticleTypes + iKinematicRegion * fkNumberScoringPositions * fkNumberParticleTypes
77 iScoringShell * fkNumberKinematicRegions <<
78 + iKinematicRegion * fkNumberScoringPosi <<
79 + iScoringPosition * fkNumberParticleTyp 74 + iScoringPosition * fkNumberParticleTypes + iParticleType;
80 } 75 }
81 if (index < 0 || index >= fkNumberCombinatio << 76 if ( index < 0 || index >= fkNumberCombinations ) {
82 G4cerr << "SteppingAction::GetIndex : WRON 77 G4cerr << "SteppingAction::GetIndex : WRONG index=" << index << " set it to 0 !" << G4endl;
83 index = 0; 78 index = 0;
84 } 79 }
85 return index; 80 return index;
86 } 81 }
87 82
88 //....oooOO0OOooo........oooOO0OOooo........oo 83 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
89 84
90 SteppingAction::SteppingAction() : G4UserStepp << 85 SteppingAction::SteppingAction() :G4UserSteppingAction() {
91 { <<
92 Initialize(); 86 Initialize();
93 } 87 }
94 88
95 //....oooOO0OOooo........oooOO0OOooo........oo 89 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
96 90
97 void SteppingAction::Initialize() << 91 void SteppingAction::Initialize() {
98 { <<
99 // Initialization needed at the beginning of 92 // Initialization needed at the beginning of each Run
100 fPrimaryParticleId = 0; 93 fPrimaryParticleId = 0;
101 fPrimaryParticleEnergy = 0.0; 94 fPrimaryParticleEnergy = 0.0;
102 fPrimaryParticleDirection = G4ThreeVector(0. << 95 fPrimaryParticleDirection = G4ThreeVector( 0.0, 0.0, 1.0 );
103 fTrackerMaterialName = fEmCaloMaterialName = 96 fTrackerMaterialName = fEmCaloMaterialName = fHadCaloMaterialName = "";
104 fIsFirstStepOfTheEvent = true; 97 fIsFirstStepOfTheEvent = true;
105 fIsFirstStepInTracker = fIsFirstStepInEmCalo 98 fIsFirstStepInTracker = fIsFirstStepInEmCalo = fIsFirstStepInHadCalo = true;
106 fIsFirstStepInScoringTrackerShell = fIsFirst 99 fIsFirstStepInScoringTrackerShell = fIsFirstStepInScoringEmCaloShell =
107 fIsFirstStepInScoringHadCaloShell = true; << 100 fIsFirstStepInScoringHadCaloShell = true;
108 fCubicVolumeScoringTrackerShell = fCubicVolu 101 fCubicVolumeScoringTrackerShell = fCubicVolumeScoringEmCaloShell =
109 fCubicVolumeScoringHadCaloShell = 1.0; 102 fCubicVolumeScoringHadCaloShell = 1.0;
110 for (G4int i = 0; i < fkNumberCombinations; << 103 for ( G4int i = 0; i < fkNumberCombinations; ++i ) {
111 fArraySumStepLengths[i] = 0.0; 104 fArraySumStepLengths[i] = 0.0;
112 } 105 }
113 /* 106 /*
114 for ( G4int i = 0; i < fkNumberCombinations; 107 for ( G4int i = 0; i < fkNumberCombinations; ++i ) fArraySumStepLengths[i] = 999.9;
115 G4cout << " fkNumberCombinations=" << fkNumb 108 G4cout << " fkNumberCombinations=" << fkNumberCombinations << G4endl;
116 for ( G4int i = 0; i < fkNumberScoringShells 109 for ( G4int i = 0; i < fkNumberScoringShells; ++i ) {
117 for ( G4int j = 0; j < fkNumberKinematicRe 110 for ( G4int j = 0; j < fkNumberKinematicRegions; ++j ) {
118 for ( G4int k = 0; k < fkNumberScoringPo 111 for ( G4int k = 0; k < fkNumberScoringPositions; ++k ) {
119 for ( G4int ll = 0; ll < fkNumberParti 112 for ( G4int ll = 0; ll < fkNumberParticleTypes; ++ll ) {
120 G4int index = GetIndex( i, j, k, ll 113 G4int index = GetIndex( i, j, k, ll );
121 G4cout << "(i, j, k, ll)=(" << i << 114 G4cout << "(i, j, k, ll)=(" << i << ", " << j << ", " << k << ", "
122 << ll << ") ->" << index; 115 << ll << ") ->" << index;
123 if ( fArraySumStepLengths[ index ] < 116 if ( fArraySumStepLengths[ index ] < 1.0 ) G4cout << " <=== REPEATED!";
124 else 117 else fArraySumStepLengths[ index ] = 0.0;
125 G4cout << G4endl; 118 G4cout << G4endl;
126 } 119 }
127 } 120 }
128 } 121 }
129 } 122 }
130 for ( G4int i = 0; i < fkNumberCombinations; 123 for ( G4int i = 0; i < fkNumberCombinations; ++i ) {
131 if ( fArraySumStepLengths[i] > 999.0 ) G4c 124 if ( fArraySumStepLengths[i] > 999.0 ) G4cout << " i=" << i << " NOT COVERED !" << G4endl;
132 } 125 }
133 */ 126 */
134 } 127 }
135 128
136 //....oooOO0OOooo........oooOO0OOooo........oo 129 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
137 130
138 void SteppingAction::UserSteppingAction(const << 131 void SteppingAction::UserSteppingAction( const G4Step* theStep ) {
139 { <<
140 // Get information on the primary particle 132 // Get information on the primary particle
141 if (fIsFirstStepOfTheEvent) { << 133 if ( fIsFirstStepOfTheEvent ) {
142 if (theStep->GetTrack()->GetParentID() == << 134 if ( theStep->GetTrack()->GetParentID() == 0 ) {
143 fPrimaryParticleId = theStep->GetTrack() 135 fPrimaryParticleId = theStep->GetTrack()->GetDefinition()->GetPDGEncoding();
144 fPrimaryParticleEnergy = theStep->GetPre 136 fPrimaryParticleEnergy = theStep->GetPreStepPoint()->GetKineticEnergy();
145 fPrimaryParticleDirection = theStep->Get 137 fPrimaryParticleDirection = theStep->GetPreStepPoint()->GetMomentumDirection();
146 if (fRunPtr) { << 138 if ( fRunPtr ) {
147 fRunPtr->SetPrimaryParticleId(fPrimary << 139 fRunPtr->SetPrimaryParticleId( fPrimaryParticleId );
148 fRunPtr->SetPrimaryParticleEnergy(fPri << 140 fRunPtr->SetPrimaryParticleEnergy( fPrimaryParticleEnergy );
149 fRunPtr->SetPrimaryParticleDirection(f << 141 fRunPtr->SetPrimaryParticleDirection( fPrimaryParticleDirection );
150 } 142 }
151 fIsFirstStepOfTheEvent = false; 143 fIsFirstStepOfTheEvent = false;
152 } 144 }
153 } 145 }
154 // Get information on the materials 146 // Get information on the materials
155 if (fIsFirstStepInTracker << 147 if ( fIsFirstStepInTracker &&
156 && theStep->GetPreStepPoint()->GetPhysic << 148 theStep->GetPreStepPoint()->GetPhysicalVolume()->GetName() == "physiTrackerShell" ) {
157 { <<
158 fTrackerMaterialName = theStep->GetPreStep 149 fTrackerMaterialName = theStep->GetPreStepPoint()->GetMaterial()->GetName();
159 if (fRunPtr) fRunPtr->SetTrackerMaterialNa << 150 if ( fRunPtr ) fRunPtr->SetTrackerMaterialName( fTrackerMaterialName );
160 fIsFirstStepInTracker = false; 151 fIsFirstStepInTracker = false;
161 } 152 }
162 if (fIsFirstStepInEmCalo << 153 if ( fIsFirstStepInEmCalo &&
163 && theStep->GetPreStepPoint()->GetPhysic << 154 theStep->GetPreStepPoint()->GetPhysicalVolume()->GetName() == "physiEmCaloShell" ) {
164 { <<
165 fEmCaloMaterialName = theStep->GetPreStepP 155 fEmCaloMaterialName = theStep->GetPreStepPoint()->GetMaterial()->GetName();
166 if (fRunPtr) fRunPtr->SetEmCaloMaterialNam << 156 if ( fRunPtr ) fRunPtr->SetEmCaloMaterialName( fEmCaloMaterialName );
167 fIsFirstStepInEmCalo = false; 157 fIsFirstStepInEmCalo = false;
168 } 158 }
169 if (fIsFirstStepInHadCalo << 159 if ( fIsFirstStepInHadCalo &&
170 && theStep->GetPreStepPoint()->GetPhysic << 160 theStep->GetPreStepPoint()->GetPhysicalVolume()->GetName() == "physiHadCaloShell" ) {
171 { <<
172 fHadCaloMaterialName = theStep->GetPreStep 161 fHadCaloMaterialName = theStep->GetPreStepPoint()->GetMaterial()->GetName();
173 if (fRunPtr) fRunPtr->SetHadCaloMaterialNa << 162 if ( fRunPtr ) fRunPtr->SetHadCaloMaterialName( fHadCaloMaterialName );
174 fIsFirstStepInHadCalo = false; 163 fIsFirstStepInHadCalo = false;
175 } 164 }
176 // Get information on step lengths in the sc 165 // Get information on step lengths in the scoring shells
177 G4int iScoringShell = -1; 166 G4int iScoringShell = -1;
178 if (theStep->GetPreStepPoint()->GetPhysicalV << 167 if ( theStep->GetPreStepPoint()->GetPhysicalVolume()->GetName() ==
>> 168 "physiScoringTrackerShell" ) {
179 iScoringShell = 0; 169 iScoringShell = 0;
180 if (fIsFirstStepInScoringTrackerShell) { << 170 if ( fIsFirstStepInScoringTrackerShell ) {
181 fCubicVolumeScoringTrackerShell = 171 fCubicVolumeScoringTrackerShell =
182 theStep->GetTrack()->GetVolume()->GetL 172 theStep->GetTrack()->GetVolume()->GetLogicalVolume()->GetSolid()->GetCubicVolume();
183 if (fRunPtr) fRunPtr->SetCubicVolumeScor << 173 if ( fRunPtr ) fRunPtr->SetCubicVolumeScoringTrackerShell( fCubicVolumeScoringTrackerShell );
184 fIsFirstStepInScoringTrackerShell = fals 174 fIsFirstStepInScoringTrackerShell = false;
185 } 175 }
186 } << 176 } else if ( theStep->GetPreStepPoint()->GetPhysicalVolume()->GetName() ==
187 else if (theStep->GetPreStepPoint()->GetPhys << 177 "physiScoringEmCaloShell" ) {
188 { <<
189 iScoringShell = 1; 178 iScoringShell = 1;
190 if (fIsFirstStepInScoringEmCaloShell) { << 179 if ( fIsFirstStepInScoringEmCaloShell ) {
191 fCubicVolumeScoringEmCaloShell = 180 fCubicVolumeScoringEmCaloShell =
192 theStep->GetTrack()->GetVolume()->GetL 181 theStep->GetTrack()->GetVolume()->GetLogicalVolume()->GetSolid()->GetCubicVolume();
193 if (fRunPtr) fRunPtr->SetCubicVolumeScor << 182 if ( fRunPtr ) fRunPtr->SetCubicVolumeScoringEmCaloShell( fCubicVolumeScoringEmCaloShell );
194 fIsFirstStepInScoringEmCaloShell = false 183 fIsFirstStepInScoringEmCaloShell = false;
195 } 184 }
196 } << 185 } else if ( theStep->GetPreStepPoint()->GetPhysicalVolume()->GetName() ==
197 else if (theStep->GetPreStepPoint()->GetPhys << 186 "physiScoringHadCaloShell" ) {
198 { <<
199 iScoringShell = 2; 187 iScoringShell = 2;
200 if (fIsFirstStepInScoringHadCaloShell) { << 188 if ( fIsFirstStepInScoringHadCaloShell ) {
201 fCubicVolumeScoringHadCaloShell = 189 fCubicVolumeScoringHadCaloShell =
202 theStep->GetTrack()->GetVolume()->GetL 190 theStep->GetTrack()->GetVolume()->GetLogicalVolume()->GetSolid()->GetCubicVolume();
203 if (fRunPtr) fRunPtr->SetCubicVolumeScor << 191 if ( fRunPtr ) fRunPtr->SetCubicVolumeScoringHadCaloShell( fCubicVolumeScoringHadCaloShell );
204 fIsFirstStepInScoringHadCaloShell = fals 192 fIsFirstStepInScoringHadCaloShell = false;
205 } 193 }
206 } 194 }
207 if (iScoringShell >= 0) { << 195 if ( iScoringShell >= 0 ) {
208 G4double stepLength = theStep->GetTrack()- 196 G4double stepLength = theStep->GetTrack()->GetStepLength() * theStep->GetTrack()->GetWeight();
209 G4int absPdg = theStep->GetTrack()->GetDef << 197 G4int absPdg = theStep->GetTrack()->GetDefinition() == nullptr ? 0 :
210 ? 0 << 198 std::abs( theStep->GetTrack()->GetDefinition()->GetPDGEncoding() );
211 : std::abs(theStep->GetTr <<
212 /* 199 /*
213 G4cout << theStep->GetTrack()->GetDefiniti 200 G4cout << theStep->GetTrack()->GetDefinition()->GetParticleName() << " absPdg=" << absPdg
214 << " Ekin[MeV]=" << theStep->GetPr 201 << " Ekin[MeV]=" << theStep->GetPreStepPoint()->GetKineticEnergy()
215 << " r[mm]=" << theStep->GetTrack( 202 << " r[mm]=" << theStep->GetTrack()->GetPosition().mag()
216 << " z[mm]=" << theStep->GetTrack( 203 << " z[mm]=" << theStep->GetTrack()->GetPosition().z()
217 << " " << theStep->GetTrack()->Get 204 << " " << theStep->GetTrack()->GetVolume()->GetName()
218 << " " << theStep->GetTrack()->Get 205 << " " << theStep->GetTrack()->GetMaterial()->GetName()
219 << " L[mm]=" << stepLength << " " << 206 << " L[mm]=" << stepLength << " "
220 << ( fPrimaryParticleDirection.dot( 207 << ( fPrimaryParticleDirection.dot( theStep->GetTrack()->GetPosition().unit() ) > 0.0
221 ? "forward" : "backward" ) << 208 ? "forward" : "backward" ) << G4endl;
222 */ 209 */
223 // Three kinematical regions: [0] : any v 210 // Three kinematical regions: [0] : any value ; [1] : below 20 MeV ; [2] : above 20 MeV
224 G4int iKinematicRegion = theStep->GetPreSt 211 G4int iKinematicRegion = theStep->GetPreStepPoint()->GetKineticEnergy() < 20.0 ? 1 : 2;
225 // Two scoring positions: [0] : forward h 212 // Two scoring positions: [0] : forward hemisphere ; [1] : backward hemisphere
226 // (with respect to the primary particle i 213 // (with respect to the primary particle initial direction)
227 G4int iScoringPosition = 214 G4int iScoringPosition =
228 fPrimaryParticleDirection.dot(theStep->G << 215 fPrimaryParticleDirection.dot( theStep->GetTrack()->GetPosition().unit() ) > 0.0 ? 0 : 1;
229 G4int iParticleType = -1; 216 G4int iParticleType = -1;
230 if (absPdg == 11) << 217 if ( absPdg == 11 ) iParticleType = 1; // electron (and positron)
231 iParticleType = 1; // electron (and pos << 218 else if ( absPdg == 22 ) iParticleType = 2; // gamma
232 else if (absPdg == 22) << 219 else if ( absPdg == 13 ) iParticleType = 3; // muons (mu- and mu+)
233 iParticleType = 2; // gamma << 220 else if ( absPdg == 12 || absPdg == 14 || absPdg == 16 ) iParticleType = 4; // neutrinos
234 else if (absPdg == 13) << 221 // (and anti-neutrinos), all flavors
235 iParticleType = 3; // muons (mu- and mu << 222 else if ( absPdg == 111 || absPdg == 211 ) iParticleType = 5; // (charged) pions
236 else if (absPdg == 12 || absPdg == 14 || a << 223 else if ( absPdg == 2112 ) iParticleType = 6; // neutron (and anti-neutron)
237 iParticleType = 4; // neutrinos << 224 else if ( absPdg == 2212 ) iParticleType = 7; // proton (and anti-proton)
238 // (and anti-neutrinos), all flavors << 225 else if ( G4IonTable::IsIon( theStep->GetTrack()->GetDefinition() ) || // ions (and anti-ions)
239 else if (absPdg == 111 || absPdg == 211) << 226 G4IonTable::IsAntiIon( theStep->GetTrack()->GetDefinition() ) ) iParticleType = 8;
240 iParticleType = 5; // (charged) pions << 227 else if ( absPdg < 1000 ) iParticleType = 9; // other mesons (e.g. kaons) (Note: this works
241 else if (absPdg == 2112) << 228 // in most cases, but not always!)
242 iParticleType = 6; // neutron (and anti << 229 else if ( absPdg > 1000 ) iParticleType = 10; // other baryons (e.g. hyperons, anti-hyperons,
243 else if (absPdg == 2212) << 230 // etc.)
244 iParticleType = 7; // proton (and anti <<
245 else if (G4IonTable::IsIon(theStep->GetTra <<
246 G4IonTable::IsAntiIon(theStep->Ge <<
247 iParticleType = 8; <<
248 else if (absPdg < 1000) <<
249 iParticleType = 9; // other mesons (e.g <<
250 // in most cases, bu <<
251 else if (absPdg > 1000) <<
252 iParticleType = 10; // other baryons (e <<
253 // etc.) <<
254 // Consider the specific case : scoring sh 231 // Consider the specific case : scoring shell, kinematic region, scoring position, and
255 // particle type 232 // particle type
256 G4int index = GetIndex(iScoringShell, iKin << 233 G4int index = GetIndex( iScoringShell, iKinematicRegion, iScoringPosition, iParticleType );
257 fArraySumStepLengths[index] += stepLength; 234 fArraySumStepLengths[index] += stepLength;
258 // Consider the "all" particle case, with 235 // Consider the "all" particle case, with the same scoring shell, kinematic region and
259 // scoring position 236 // scoring position
260 index = GetIndex(iScoringShell, iKinematic << 237 index = GetIndex( iScoringShell, iKinematicRegion, iScoringPosition, 0 );
261 fArraySumStepLengths[index] += stepLength; 238 fArraySumStepLengths[index] += stepLength;
262 // Consider the "any" kinematic region cas 239 // Consider the "any" kinematic region case, with the same scoring shell, scoring position
263 // and particle type << 240 // and particle type
264 index = GetIndex(iScoringShell, 0, iScorin << 241 index = GetIndex( iScoringShell, 0, iScoringPosition, iParticleType );
265 fArraySumStepLengths[index] += stepLength; 242 fArraySumStepLengths[index] += stepLength;
266 // Consider the "any" kinematic region and 243 // Consider the "any" kinematic region and "all" particle, with the same scoring shell and
267 // scoring position << 244 // scoring position
268 index = GetIndex(iScoringShell, 0, iScorin << 245 index = GetIndex( iScoringShell, 0, iScoringPosition, 0 );
269 fArraySumStepLengths[index] += stepLength; 246 fArraySumStepLengths[index] += stepLength;
270 if (fRunPtr) fRunPtr->SetSteppingArray(fAr << 247 if ( fRunPtr ) fRunPtr->SetSteppingArray( fArraySumStepLengths );
271 } 248 }
272 } 249 }
273 250
274 //....oooOO0OOooo........oooOO0OOooo........oo 251 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
275 252