Changeset 1340 for trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4NuclearLevelStore.cc

Timestamp:

Nov 5, 2010, 3:45:55 PM (14 years ago)

Author:

garnier

Message:

update ti head

File:

• trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4NuclearLevelStore.cc (modified) (4 diffs)

trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/src/G4NuclearLevelStore.cc

@@ -24 +24 @@
 // ********************************************************************
 //
+// $Id: G4NuclearLevelStore.cc,v 1.4 2010/10/07 07:50:13 mkelsey Exp $
 //
+// 20101006  M. Kelsey -- Drop static data members.
 
 #include "G4NuclearLevelStore.hh"
 #include <sstream>
-
-std::map<G4String,G4NuclearLevelManager*> G4NuclearLevelStore::theManagers;
-G4String G4NuclearLevelStore::dirName("");
 
 G4NuclearLevelStore* G4NuclearLevelStore::GetInstance()
@@ -56 +55 @@
 G4NuclearLevelStore::~G4NuclearLevelStore()
 {
-    std::map<G4String,G4NuclearLevelManager*>::iterator i;
+    ManagersMap::iterator i;
     for (i = theManagers.begin(); i != theManagers.end(); ++i)
-    {
-        if ( (*i).second ) delete (*i).second;
-    }
+      delete i->second;
 }
 
-G4String G4NuclearLevelStore::GenerateKey(const G4int Z, const G4int A)
-{
+G4String 
+G4NuclearLevelStore::GenerateFilename(const G4int Z, const G4int A) const {
     std::ostringstream streamName; 
     streamName << 'z' << Z << ".a" << A;
@@ -72 +69 @@
 
 
-G4NuclearLevelManager* G4NuclearLevelStore::GetManager(const G4int Z, const G4int A)
-{
+G4NuclearLevelManager* 
+G4NuclearLevelStore::GetManager(const G4int Z, const G4int A) {
     G4NuclearLevelManager * result = 0; 
     if (A < 1 || Z < 1 || A < Z)
@@ -81 +78 @@
         return result;
     }
+
     // Generate the key = filename
-    G4String key(this->GenerateKey(Z,A));
+    G4int key = GenerateKey(Z,A);
     
     // Check if already exists that key
-    std::map<G4String,G4NuclearLevelManager*>::iterator idx = theManagers.find(key);
+    ManagersMap::iterator idx = theManagers.find(key);
     // If doesn't exists then create it
     if ( idx == theManagers.end() )
     {
-        result = new G4NuclearLevelManager();
-        result->SetNucleus(Z,A,dirName + key);
-        theManagers.insert(std::make_pair(key,result));
+        G4String file = GenerateFilename(Z,A);
+        result = new G4NuclearLevelManager(Z,A,dirName + file);
+        theManagers.insert(std::make_pair(key,result));
     }
     // But if it exists...