| 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 // $Id: G4DNADamage.cc 85152 2014-10-24 16:07:37Z matkara $
26 // 27 //
27 #include "G4DNADamage.hh" 28 #include "G4DNADamage.hh"
28 #include "G4UnitsTable.hh" 29 #include "G4UnitsTable.hh"
29 30
30 G4ThreadLocal G4DNADamage* G4DNADamage::fpInst << 31 G4ThreadLocal G4DNADamage* G4DNADamage::fpInstance(0);
31 32
32 G4DNAIndirectHit::G4DNAIndirectHit(const G4Str 33 G4DNAIndirectHit::G4DNAIndirectHit(const G4String& baseName,
33 const G4Mol 34 const G4Molecule* molecule,
34 const G4Thr 35 const G4ThreeVector& position,
35 G4double ti 36 G4double time) :
36 fpMolecule(molecule) << 37 G4VDNAHit(), fpMolecule(molecule)
37 { 38 {
38 fBaseName = baseName; 39 fBaseName = baseName;
39 fPosition = position; 40 fPosition = position;
40 fTime = time; 41 fTime = time;
41 } 42 }
42 43
43 G4DNAIndirectHit::~G4DNAIndirectHit() 44 G4DNAIndirectHit::~G4DNAIndirectHit()
44 { 45 {
45 delete fpMolecule; << 46 if (fpMolecule) delete fpMolecule;
46 fpMolecule = nullptr; << 47 fpMolecule = 0;
47 } 48 }
48 49
49 void G4DNAIndirectHit::Print() 50 void G4DNAIndirectHit::Print()
50 { 51 {
51 G4cout << "Reaction : " << fpMolecule->GetNa 52 G4cout << "Reaction : " << fpMolecule->GetName() << " + " << fBaseName
52 << " at position : " << G4BestUnit(fP 53 << " at position : " << G4BestUnit(fPosition, "Length")
53 << " and time : " << G4BestUnit(fTime 54 << " and time : " << G4BestUnit(fTime, "Time") << G4endl;
54 } 55 }
55 56
56 G4DNADamage* G4DNADamage::Instance() 57 G4DNADamage* G4DNADamage::Instance()
57 { 58 {
58 if (fpInstance == nullptr) new G4DNADamage() << 59 if (!fpInstance) new G4DNADamage();
59 60
60 return fpInstance; 61 return fpInstance;
61 } 62 }
62 63
63 G4DNADamage::G4DNADamage() 64 G4DNADamage::G4DNADamage()
64 { 65 {
65 fJustCountDamage = false; 66 fJustCountDamage = false;
66 fNIndirectDamage = 0; 67 fNIndirectDamage = 0;
67 fpInstance = this; 68 fpInstance = this;
68 } 69 }
69 70
70 G4DNADamage::~G4DNADamage() 71 G4DNADamage::~G4DNADamage()
71 { 72 {
72 for (auto & fIndirectHit : fIndirectHits) << 73 for (int i = 0; i < (int) fIndirectHits.size(); i++)
73 { 74 {
74 delete fIndirectHit; << 75 if (fIndirectHits[i]) delete fIndirectHits[i];
75 } 76 }
76 fIndirectHits.clear(); 77 fIndirectHits.clear();
77 } 78 }
78 79
79 void G4DNADamage::DeleteInstance() 80 void G4DNADamage::DeleteInstance()
80 { 81 {
81 delete fpInstance; << 82 if (fpInstance) delete fpInstance;
82 fpInstance = nullptr; << 83 fpInstance = 0;
83 } 84 }
84 85
85 void G4DNADamage::Reset() 86 void G4DNADamage::Reset()
86 { 87 {
87 fNIndirectDamage = 0; 88 fNIndirectDamage = 0;
88 for (auto & fIndirectHit : fIndirectHits) << 89 for (int i = 0; i < (int) fIndirectHits.size(); i++)
89 { 90 {
90 delete fIndirectHit; << 91 if (fIndirectHits[i]) delete fIndirectHits[i];
91 } 92 }
92 fIndirectHits.clear(); 93 fIndirectHits.clear();
93 } 94 }
94 95
95 void G4DNADamage::AddIndirectDamage(const G4St 96 void G4DNADamage::AddIndirectDamage(const G4String& baseName,
96 const G4Mo 97 const G4Molecule* molecule,
97 const G4Th 98 const G4ThreeVector& position,
98 G4double t 99 G4double time)
99 { 100 {
100 if (fJustCountDamage) 101 if (fJustCountDamage)
101 { 102 {
102 fNIndirectDamage++; 103 fNIndirectDamage++;
103 return; 104 return;
104 } 105 }
105 106
106 G4DNAIndirectHit* indirectHit = nullptr; << 107 G4DNAIndirectHit* indirectHit = 0;
107 auto it = fMolMap.find(*molecule); << 108 std::map<G4Molecule, const G4Molecule*>::iterator it =
>> 109 fMolMap.find(*molecule);
108 110
109 if (it == fMolMap.cend()) << 111 if (it == fMolMap.end())
110 { 112 {
111 G4Molecule* mol(nullptr); << 113 G4Molecule* mol(0);
112 fMolMap[*molecule] = (mol = new G4Molecule 114 fMolMap[*molecule] = (mol = new G4Molecule(*molecule));
113 indirectHit = new G4DNAIndirectHit(baseNam 115 indirectHit = new G4DNAIndirectHit(baseName, mol, position, time);
114 } 116 }
115 else 117 else
116 { 118 {
117 indirectHit = new G4DNAIndirectHit(baseNam 119 indirectHit = new G4DNAIndirectHit(baseName, it->second, position, time);
118 } 120 }
119 fIndirectHits.push_back(indirectHit); 121 fIndirectHits.push_back(indirectHit);
120 } 122 }
121 123