Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/processes/electromagnetic/dna/molecules/management/src/G4MoleculeHandleManager.cc

Version: [ ReleaseNotes ] [ 1.0 ] [ 1.1 ] [ 2.0 ] [ 3.0 ] [ 3.1 ] [ 3.2 ] [ 4.0 ] [ 4.0.p1 ] [ 4.0.p2 ] [ 4.1 ] [ 4.1.p1 ] [ 5.0 ] [ 5.0.p1 ] [ 5.1 ] [ 5.1.p1 ] [ 5.2 ] [ 5.2.p1 ] [ 5.2.p2 ] [ 6.0 ] [ 6.0.p1 ] [ 6.1 ] [ 6.2 ] [ 6.2.p1 ] [ 6.2.p2 ] [ 7.0 ] [ 7.0.p1 ] [ 7.1 ] [ 7.1.p1 ] [ 8.0 ] [ 8.0.p1 ] [ 8.1 ] [ 8.1.p1 ] [ 8.1.p2 ] [ 8.2 ] [ 8.2.p1 ] [ 8.3 ] [ 8.3.p1 ] [ 8.3.p2 ] [ 9.0 ] [ 9.0.p1 ] [ 9.0.p2 ] [ 9.1 ] [ 9.1.p1 ] [ 9.1.p2 ] [ 9.1.p3 ] [ 9.2 ] [ 9.2.p1 ] [ 9.2.p2 ] [ 9.2.p3 ] [ 9.2.p4 ] [ 9.3 ] [ 9.3.p1 ] [ 9.3.p2 ] [ 9.4 ] [ 9.4.p1 ] [ 9.4.p2 ] [ 9.4.p3 ] [ 9.4.p4 ] [ 9.5 ] [ 9.5.p1 ] [ 9.5.p2 ] [ 9.6 ] [ 9.6.p1 ] [ 9.6.p2 ] [ 9.6.p3 ] [ 9.6.p4 ] [ 10.0 ] [ 10.0.p1 ] [ 10.0.p2 ] [ 10.0.p3 ] [ 10.0.p4 ] [ 10.1 ] [ 10.1.p1 ] [ 10.1.p2 ] [ 10.1.p3 ] [ 10.2 ] [ 10.2.p1 ] [ 10.2.p2 ] [ 10.2.p3 ] [ 10.3 ] [ 10.3.p1 ] [ 10.3.p2 ] [ 10.3.p3 ] [ 10.4 ] [ 10.4.p1 ] [ 10.4.p2 ] [ 10.4.p3 ] [ 10.5 ] [ 10.5.p1 ] [ 10.6 ] [ 10.6.p1 ] [ 10.6.p2 ] [ 10.6.p3 ] [ 10.7 ] [ 10.7.p1 ] [ 10.7.p2 ] [ 10.7.p3 ] [ 10.7.p4 ] [ 11.0 ] [ 11.0.p1 ] [ 11.0.p2 ] [ 11.0.p3, ] [ 11.0.p4 ] [ 11.1 ] [ 11.1.1 ] [ 11.1.2 ] [ 11.1.3 ] [ 11.2 ] [ 11.2.1 ] [ 11.2.2 ] [ 11.3.0 ]

Diff markup

Differences between /processes/electromagnetic/dna/molecules/management/src/G4MoleculeHandleManager.cc (Version 11.3.0) and /processes/electromagnetic/dna/molecules/management/src/G4MoleculeHandleManager.cc (Version 11.0.p4)


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