| 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: G4MoleculeHandleManager.cc 84858 2014-10-21 16:08:22Z gcosmo $
26 // 27 //
27 #include "G4MoleculeHandleManager.hh" 28 #include "G4MoleculeHandleManager.hh"
28 #include "G4Molecule.hh" 29 #include "G4Molecule.hh"
29 30
30 using namespace std; 31 using namespace std;
31 32
32 G4ThreadLocal G4MoleculeHandleManager* G4Molec << 33 G4ThreadLocal G4MoleculeHandleManager* G4MoleculeHandleManager::fInstance(0);
33 34
34 G4MoleculeHandleManager::G4MoleculeHandleManag 35 G4MoleculeHandleManager::G4MoleculeHandleManager()
35 = default; << 36 {
>> 37 // G4cout << "G4MoleculeHandleManager::G4MoleculeHandleManager()" << G4endl;
>> 38 }
36 39
37 G4bool G4MoleculeHandleManager::CompMoleculePo 40 G4bool G4MoleculeHandleManager::CompMoleculePointer::operator()(const G4Molecule* mol1,
38 41 const G4Molecule* mol2) const
39 { 42 {
40 return (*mol1) < (*mol2); 43 return (*mol1) < (*mol2);
41 } 44 }
42 45
43 G4MoleculeHandleManager::~G4MoleculeHandleMana 46 G4MoleculeHandleManager::~G4MoleculeHandleManager()
44 { 47 {
45 if (!fMoleculeHandle.empty()) << 48 if (fMoleculeHandle.empty() == false)
46 { 49 {
47 auto it = fMoleculeHandle.begin(); << 50 MoleculeHandleMap::iterator it = fMoleculeHandle.begin();
48 for (; it != fMoleculeHandle.end(); it++) 51 for (; it != fMoleculeHandle.end(); it++)
49 { 52 {
50 it->second.reset(); 53 it->second.reset();
51 } 54 }
52 } 55 }
53 } 56 }
54 57
55 void G4MoleculeHandleManager::DeleteInstance() 58 void G4MoleculeHandleManager::DeleteInstance()
56 { 59 {
57 if (fInstance != nullptr) << 60 if (fInstance)
58 { 61 {
59 delete fInstance; 62 delete fInstance;
60 fInstance = nullptr; << 63 fInstance = 0;
61 } 64 }
62 } 65 }
63 66
64 G4MoleculeHandleManager* G4MoleculeHandleManag 67 G4MoleculeHandleManager* G4MoleculeHandleManager::Instance()
65 { 68 {
66 if (fInstance == nullptr) << 69 if (!fInstance)
67 { 70 {
68 fInstance = new G4MoleculeHandleManager; 71 fInstance = new G4MoleculeHandleManager;
69 } 72 }
70 return fInstance; 73 return fInstance;
71 } 74 }
72 75
73 G4MoleculeHandle G4MoleculeHandleManager::GetM 76 G4MoleculeHandle G4MoleculeHandleManager::GetMoleculeHandle(const G4Molecule* molecule)
74 { 77 {
75 auto it = fMoleculeHandle.find(molecule); << 78 MoleculeHandleMap::iterator it = fMoleculeHandle.find(molecule);
76 G4MoleculeHandle molHandle; 79 G4MoleculeHandle molHandle;
77 80
78 if (it != fMoleculeHandle.end()) 81 if (it != fMoleculeHandle.end())
79 { 82 {
80 molHandle = G4MoleculeHandle(it->second); 83 molHandle = G4MoleculeHandle(it->second);
81 } 84 }
82 else 85 else
83 { 86 {
84 molHandle = G4MoleculeHandle(molecule); 87 molHandle = G4MoleculeHandle(molecule);
85 fMoleculeHandle.insert(make_pair(molecule, 88 fMoleculeHandle.insert(make_pair(molecule, G4MoleculeHandle(molHandle)));
86 } 89 }
87 90
88 return molHandle; 91 return molHandle;
89 } 92 }
90 93