Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/processes/electromagnetic/dna/molecules/management/src/G4VMoleculeCounter.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/G4VMoleculeCounter.cc (Version 11.3.0) and /processes/electromagnetic/dna/molecules/management/src/G4VMoleculeCounter.cc (Version 10.3.p1)


  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 //  G4VMoleculeCounter.cc                          26 //  G4VMoleculeCounter.cc
 27 //  Geant4                                         27 //  Geant4
 28 //                                                 28 //
 29 //  Created by Mathieu Karamitros on 02/11/201     29 //  Created by Mathieu Karamitros on 02/11/2016.
 30 //                                                 30 //
 31 //                                                 31 //
 32                                                    32 
 33 #include "G4VMoleculeCounter.hh"                   33 #include "G4VMoleculeCounter.hh"
 34 #include "G4MoleculeCounter.hh"                    34 #include "G4MoleculeCounter.hh"
                                                   >>  35 
                                                   >>  36 using namespace std;
                                                   >>  37 
                                                   >>  38 G4bool G4VMoleculeCounter::fUse = false;
 35 G4ThreadLocal                                      39 G4ThreadLocal
 36 G4VMoleculeCounter* G4VMoleculeCounter::fpInst <<  40 G4VMoleculeCounter* G4VMoleculeCounter::fpInstance = 0;
 37                                                    41 
 38 //--------------------------------------------     42 //------------------------------------------------------------------------------
 39                                                    43 
 40 void                                               44 void
 41 G4VMoleculeCounter::SetInstance(G4VMoleculeCou <<  45 G4VMoleculeCounter::SetInstance(G4VMoleculeCounter* instance)
 42 {                                                  46 {
 43     if (fpInstance != nullptr)                 <<  47   if (fpInstance!=0){
 44     {                                          <<  48     G4ExceptionDescription errMsg;
 45         G4ExceptionDescription errMsg;         <<  49     errMsg<< "The G4MoleculeCounter was already initialized." << G4endl
 46         errMsg << "The G4MoleculeCounter was a <<  50     << "The previous instance will be deleted in order to use yours." << G4endl
 47                << "The previous instance will  <<  51     << "However this can generate conflicts. Make sure you call G4MoleculeCounter::SetInstance at the beginning of your application."
 48                << "However this can generate c <<  52     << "A good place would be ActionInitialization::Build & BuildForMaster"
 49                   "at the beginning of your ap <<  53     << G4endl;
 50                << "A good place would be Actio <<  54     
 51                << G4endl;                      <<  55     G4Exception("G4MoleculeCounter::SetInstance",
 52                                                <<  56                 "SINGLETON_ALREADY_INITIALIZED",
 53         G4Exception("G4MoleculeCounter::SetIns <<  57                 JustWarning, errMsg);
 54                     "SINGLETON_ALREADY_INITIAL <<  58     delete fpInstance;
 55                     JustWarning, errMsg);      <<  59     fpInstance = 0;
 56         delete fpInstance;                     <<  60   }
 57         fpInstance = nullptr;                  <<  61   
 58     }                                          <<  62   fpInstance = instance;
 59                                                << 
 60     fpInstance = pCounterInstance;             << 
 61 }                                                  63 }
 62                                                    64 
 63 //--------------------------------------------     65 //------------------------------------------------------------------------------
 64                                                    66 
 65 G4VMoleculeCounter* G4VMoleculeCounter::Instan     67 G4VMoleculeCounter* G4VMoleculeCounter::Instance()
 66 {                                                  68 {
 67     if (fpInstance == nullptr)                 <<  69   if (!fpInstance) fpInstance = new G4MoleculeCounter();
 68     {                                          <<  70   return fpInstance;
 69         fpInstance = new G4MoleculeCounter();  << 
 70     }                                          << 
 71     return fpInstance;                         << 
 72 }                                                  71 }
 73                                                    72 
 74 //--------------------------------------------     73 //------------------------------------------------------------------------------
 75                                                    74 
 76 void G4VMoleculeCounter::DeleteInstance()          75 void G4VMoleculeCounter::DeleteInstance()
 77 {                                                  76 {
 78     if (fpInstance != nullptr)                 <<  77   if (fpInstance){
 79     {                                          <<  78     delete fpInstance;
 80         delete fpInstance;                     <<  79     fpInstance = 0;
 81         fpInstance = nullptr;                  <<  80   }
 82     }                                          << 
 83 }                                                  81 }
 84                                                    82 
 85 //--------------------------------------------     83 //------------------------------------------------------------------------------
 86                                                    84 
 87 void G4VMoleculeCounter::InitializeInstance()      85 void G4VMoleculeCounter::InitializeInstance()
 88 {                                                  86 {
 89     if (fpInstance != nullptr)                 <<  87   if(fpInstance) fpInstance->Initialize();
 90     {                                          << 
 91         fpInstance->Initialize();              << 
 92     }                                          << 
 93 }                                                  88 }
 94                                                    89 
 95 //--------------------------------------------     90 //------------------------------------------------------------------------------
 96                                                    91 
 97 void G4VMoleculeCounter::Use(G4bool flag)          92 void G4VMoleculeCounter::Use(G4bool flag)
 98 {                                                  93 {
 99     fUse = flag;                               <<  94   fUse=flag;
100 }                                                  95 }
101                                                    96 
102 //--------------------------------------------     97 //------------------------------------------------------------------------------
103                                                    98 
104 G4bool G4VMoleculeCounter::InUse()                 99 G4bool G4VMoleculeCounter::InUse()
105 {                                                 100 {
106     return fUse;                               << 101   return fUse;
107 }                                                 102 }
108                                                   103 
109                                                   104