Geant4 Cross Reference

Cross-Referencing   Geant4
Geant4/geometry/magneticfield/src/G4FieldManagerStore.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 /geometry/magneticfield/src/G4FieldManagerStore.cc (Version 11.3.0) and /geometry/magneticfield/src/G4FieldManagerStore.cc (Version 9.6.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 // G4FieldManagerStore implementation          << 
 27 //                                                 26 //
 28 // Author: J.Apostolakis, 07.12.2007 - Adapted <<  27 // $Id: G4FieldManagerStore.cc 69786 2013-05-15 09:38:51Z gcosmo $
                                                   >>  28 //
                                                   >>  29 // G4FieldManagerStore
                                                   >>  30 //
                                                   >>  31 // Implementation for singleton container
                                                   >>  32 //
                                                   >>  33 // History:
                                                   >>  34 // 07.12.07 J.Apostolakis Adapted from G4LogicalVolumeStore
 29 // -------------------------------------------     35 // --------------------------------------------------------------------
 30                                                    36 
 31 #include "G4Types.hh"                              37 #include "G4Types.hh"
 32 #include "G4FieldManagerStore.hh"                  38 #include "G4FieldManagerStore.hh"
 33 #include "G4ChordFinder.hh"                        39 #include "G4ChordFinder.hh" 
 34                                                    40 
 35 // *******************************************     41 // ***************************************************************************
 36 // Static class variables                          42 // Static class variables
 37 // *******************************************     43 // ***************************************************************************
 38 //                                                 44 //
 39 G4ThreadLocal G4FieldManagerStore* G4FieldMana <<  45 G4FieldManagerStore* G4FieldManagerStore::fgInstance = 0;
 40 G4ThreadLocal G4bool G4FieldManagerStore::lock <<  46 G4bool G4FieldManagerStore::locked = false;
 41                                                    47 
 42 // *******************************************     48 // ***************************************************************************
 43 // Protected constructor: Construct underlying     49 // Protected constructor: Construct underlying container with
 44 // initial size of 100 entries                     50 // initial size of 100 entries
 45 // *******************************************     51 // ***************************************************************************
 46 //                                                 52 //
 47 G4FieldManagerStore::G4FieldManagerStore()         53 G4FieldManagerStore::G4FieldManagerStore()
                                                   >>  54  : std::vector<G4FieldManager*>()
 48 {                                                  55 {
 49   reserve(100);                                    56   reserve(100);
 50 }                                                  57 }
 51                                                    58 
 52 // *******************************************     59 // ***************************************************************************
 53 // Destructor                                      60 // Destructor
 54 // *******************************************     61 // ***************************************************************************
 55 //                                                 62 //
 56 G4FieldManagerStore::~G4FieldManagerStore()        63 G4FieldManagerStore::~G4FieldManagerStore()
 57 {                                                  64 {
 58   Clean();                                         65   Clean();
 59   fgInstance = nullptr;                        << 
 60 }                                                  66 }
 61                                                    67 
 62 // *******************************************     68 // ***************************************************************************
 63 // Delete all elements from the store              69 // Delete all elements from the store
 64 // *******************************************     70 // ***************************************************************************
 65 //                                                 71 //
 66 void G4FieldManagerStore::Clean()                  72 void G4FieldManagerStore::Clean()
 67 {                                                  73 {
 68   // Locks store for deletion of field manager     74   // Locks store for deletion of field managers. De-registration will be
 69   // performed at this stage. G4FieldManagers      75   // performed at this stage. G4FieldManagers will not de-register themselves.
 70   //                                               76   //
 71   locked = true;                                   77   locked = true;  
 72                                                    78 
                                                   >>  79   size_t i=0;
 73   G4FieldManagerStore* store = GetInstance();      80   G4FieldManagerStore* store = GetInstance();
 74                                                    81 
 75   for(const auto & pos : *store)               <<  82   for(iterator pos=store->begin(); pos!=store->end(); pos++)
 76   {                                                83   {
 77     delete pos;                                <<  84     if (*pos) { delete *pos; }
                                                   >>  85     i++;
 78   }                                                86   }
 79                                                    87 
                                                   >>  88 #ifdef G4GEOMETRY_DEBUG
                                                   >>  89   if (store->size() < i-1)
                                                   >>  90     { G4cout << "No field managers deleted. Already deleted by user ?" << G4endl; }
                                                   >>  91   else
                                                   >>  92     { G4cout << i-1 << " field managers deleted !" << G4endl; }
                                                   >>  93 #endif
                                                   >>  94 
 80   locked = false;                                  95   locked = false;
 81   store->clear();                                  96   store->clear();
 82 }                                                  97 }
 83                                                    98 
 84 // *******************************************     99 // ***************************************************************************
 85 // Add field manager to container                 100 // Add field manager to container
 86 // *******************************************    101 // ***************************************************************************
 87 //                                                102 //
 88 void G4FieldManagerStore::Register(G4FieldMana    103 void G4FieldManagerStore::Register(G4FieldManager* pFieldManager)
 89 {                                                 104 {
 90   GetInstance()->push_back(pFieldManager);        105   GetInstance()->push_back(pFieldManager);
 91 }                                                 106 }
 92                                                   107 
 93 // *******************************************    108 // ***************************************************************************
 94 // Remove volume from container                   109 // Remove volume from container
 95 // *******************************************    110 // ***************************************************************************
 96 //                                                111 //
 97 void G4FieldManagerStore::DeRegister(G4FieldMa    112 void G4FieldManagerStore::DeRegister(G4FieldManager* pFieldMgr)
 98 {                                                 113 {
 99   if (!locked)    // Do not de-register if loc    114   if (!locked)    // Do not de-register if locked !
100   {                                               115   {
101     for (auto i=GetInstance()->cbegin(); i!=Ge << 116     for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++)
102     {                                             117     {
103       if (*i==pFieldMgr)  //   For LogVol was     118       if (*i==pFieldMgr)  //   For LogVol was **i == *pLogVolume ... Reason?
104       {                                           119       {
105         GetInstance()->erase(i);                  120         GetInstance()->erase(i);
106         break;                                    121         break;
107       }                                           122       }
108     }                                             123     }
109   }                                               124   }
110 }                                                 125 }
111                                                   126 
112 // *******************************************    127 // ***************************************************************************
113 // Return ptr to Store, setting if necessary      128 // Return ptr to Store, setting if necessary
114 // *******************************************    129 // ***************************************************************************
115 //                                                130 //
116 G4FieldManagerStore* G4FieldManagerStore::GetI    131 G4FieldManagerStore* G4FieldManagerStore::GetInstance()
117 {                                                 132 {
118   if (fgInstance == nullptr)                   << 133   static G4FieldManagerStore worldStore;
                                                   >> 134   if (!fgInstance)
119   {                                               135   {
120     fgInstance = new G4FieldManagerStore;      << 136     fgInstance = &worldStore;
121   }                                               137   }
122   return fgInstance;                              138   return fgInstance;
123 }                                                 139 }
124                                                   140 
125 // *******************************************    141 // ***************************************************************************
126 // Return ptr to Store                         << 
127 // ******************************************* << 
128 //                                             << 
129 G4FieldManagerStore* G4FieldManagerStore::GetI << 
130 {                                              << 
131   return fgInstance;                           << 
132 }                                              << 
133                                                << 
134 // ******************************************* << 
135 // Globally reset the state                       142 // Globally reset the state
136 // *******************************************    143 // ***************************************************************************
137 //                                                144 //
138 void                                              145 void
139 G4FieldManagerStore::ClearAllChordFindersState    146 G4FieldManagerStore::ClearAllChordFindersState()
140 {                                                 147 {
141   G4ChordFinder* pChordFnd;                    << 148   G4ChordFinder *pChordFnd;
142                                                   149    
143   for (const auto & mgr : *GetInstance())      << 150   for (iterator i=GetInstance()->begin(); i!=GetInstance()->end(); i++)
144   {                                               151   {
145     pChordFnd = mgr->GetChordFinder();         << 152     pChordFnd = (*i)->GetChordFinder();
146     if( pChordFnd != nullptr )                 << 153     if( pChordFnd )
147     {                                             154     {
148       pChordFnd->ResetStepEstimate();             155       pChordFnd->ResetStepEstimate();
149     }                                             156     }
150   }                                               157   }
151 }                                                 158 }
152                                                   159