| 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 // 26 //
27 /// \file optical/LXe/src/LXeScintSD.cc 27 /// \file optical/LXe/src/LXeScintSD.cc
28 /// \brief Implementation of the LXeScintSD cl 28 /// \brief Implementation of the LXeScintSD class
29 // 29 //
30 // 30 //
31 #include "LXeScintSD.hh" 31 #include "LXeScintSD.hh"
32 32
33 #include "LXeScintHit.hh" 33 #include "LXeScintHit.hh"
34 34
>> 35 #include "G4ios.hh"
35 #include "G4LogicalVolume.hh" 36 #include "G4LogicalVolume.hh"
36 #include "G4ParticleDefinition.hh" 37 #include "G4ParticleDefinition.hh"
37 #include "G4SDManager.hh" 38 #include "G4SDManager.hh"
38 #include "G4Step.hh" 39 #include "G4Step.hh"
39 #include "G4TouchableHistory.hh" 40 #include "G4TouchableHistory.hh"
40 #include "G4Track.hh" 41 #include "G4Track.hh"
41 #include "G4VPhysicalVolume.hh" 42 #include "G4VPhysicalVolume.hh"
42 #include "G4VProcess.hh" 43 #include "G4VProcess.hh"
43 #include "G4VTouchable.hh" 44 #include "G4VTouchable.hh"
44 #include "G4ios.hh" <<
45 45
46 //....oooOO0OOooo........oooOO0OOooo........oo 46 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
47 47
48 LXeScintSD::LXeScintSD(G4String name) : G4VSen << 48 LXeScintSD::LXeScintSD(G4String name)
>> 49 : G4VSensitiveDetector(name)
49 { 50 {
50 collectionName.insert("scintCollection"); 51 collectionName.insert("scintCollection");
51 } 52 }
52 53
53 //....oooOO0OOooo........oooOO0OOooo........oo 54 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
54 55
55 void LXeScintSD::Initialize(G4HCofThisEvent* h 56 void LXeScintSD::Initialize(G4HCofThisEvent* hitsCE)
56 { 57 {
57 fScintCollection = new LXeScintHitsCollectio << 58 fScintCollection =
>> 59 new LXeScintHitsCollection(SensitiveDetectorName, collectionName[0]);
58 60
59 if (fHitsCID < 0) { << 61 if(fHitsCID < 0)
>> 62 {
60 fHitsCID = G4SDManager::GetSDMpointer()->G 63 fHitsCID = G4SDManager::GetSDMpointer()->GetCollectionID(fScintCollection);
61 } 64 }
62 hitsCE->AddHitsCollection(fHitsCID, fScintCo 65 hitsCE->AddHitsCollection(fHitsCID, fScintCollection);
63 } 66 }
64 67
65 //....oooOO0OOooo........oooOO0OOooo........oo 68 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
66 69
67 G4bool LXeScintSD::ProcessHits(G4Step* aStep, 70 G4bool LXeScintSD::ProcessHits(G4Step* aStep, G4TouchableHistory*)
68 { 71 {
69 G4double edep = aStep->GetTotalEnergyDeposit 72 G4double edep = aStep->GetTotalEnergyDeposit();
70 if (edep == 0.) return false; // No edep so << 73 if(edep == 0.)
>> 74 return false; // No edep so don't count as hit
71 75
72 G4StepPoint* thePrePoint = aStep->GetPreStep 76 G4StepPoint* thePrePoint = aStep->GetPreStepPoint();
73 auto theTouchable = (G4TouchableHistory*)(aS << 77 auto theTouchable =
>> 78 (G4TouchableHistory*) (aStep->GetPreStepPoint()->GetTouchable());
74 G4VPhysicalVolume* thePrePV = theTouchable-> 79 G4VPhysicalVolume* thePrePV = theTouchable->GetVolume();
75 80
76 G4StepPoint* thePostPoint = aStep->GetPostSt 81 G4StepPoint* thePostPoint = aStep->GetPostStepPoint();
77 82
78 // Get the average position of the hit 83 // Get the average position of the hit
79 G4ThreeVector pos = thePrePoint->GetPosition 84 G4ThreeVector pos = thePrePoint->GetPosition() + thePostPoint->GetPosition();
80 pos /= 2.; 85 pos /= 2.;
81 86
82 auto scintHit = new LXeScintHit(thePrePV); 87 auto scintHit = new LXeScintHit(thePrePV);
83 88
84 scintHit->SetEdep(edep); 89 scintHit->SetEdep(edep);
85 scintHit->SetPos(pos); 90 scintHit->SetPos(pos);
86 91
87 fScintCollection->insert(scintHit); 92 fScintCollection->insert(scintHit);
88 93
89 return true; 94 return true;
90 } 95 }
91 96
92 //....oooOO0OOooo........oooOO0OOooo........oo 97 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
93 98