Changeset 1340 for trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4NuclearLevelManager.hh

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/include/G4NuclearLevelManager.hh (modified) (7 diffs)

trunk/source/processes/hadronic/models/de_excitation/photon_evaporation/include/G4NuclearLevelManager.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-//
+// $Id: G4NuclearLevelManager.hh,v 1.5 2010/10/10 23:01:39 mkelsey Exp $
 // -------------------------------------------------------------------
 //      GEANT 4 class file 
@@ -46 +46 @@
 //              reading from experimental data. 
 //        02 May 2003,   Vladimir Ivanchenko remove rublic copy contructor
-//      
+//        06 Oct 2010, M. Kelsey -- Use object storage, not pointers, drop
+//              public access to list
 // -------------------------------------------------------------------
 
@@ -54 +55 @@
 #include "globals.hh"
 #include "G4PtrLevelVector.hh"
-#include "G4NuclearLevel.hh"
-#include "G4ios.hh"
-#include <fstream>
+#include <iosfwd>
+
+class G4NuclearLevel;
+
 
 class G4NuclearLevelManager 
@@ -71 +73 @@
   void SetNucleus(const G4int Z, const G4int A, const G4String& filename);
 
-  G4bool IsValid() const;
+  G4bool IsValid() const { return _validity; }
 
-  G4int NumberOfLevels() const;
+  G4int NumberOfLevels() const { return (_levels ? _levels->size() : 0); }
 
-  const G4PtrLevelVector* GetLevels() const;
+  const G4NuclearLevel* GetLevel(G4int i) const;
 
-  const G4NuclearLevel* NearestLevel(const G4double energy, const G4double eDiffMax=9999.*GeV) const;
+  const G4NuclearLevel* NearestLevel(const G4double energy,
+                                     const G4double eDiffMax=9999.*GeV) const;
 
   const G4NuclearLevel* LowestLevel() const;
@@ -88 +91 @@
   
 private:  
-
   const G4NuclearLevelManager& operator=(const G4NuclearLevelManager &right);
   G4bool operator==(const G4NuclearLevelManager &right) const;
@@ -94 +96 @@
 
   G4bool Read(std::ifstream& aDataFile);
- 
+  G4bool ReadDataLine(std::ifstream& dataFile);
+  G4bool ReadDataItem(std::istream& dataFile, G4double& x);
+  void ProcessDataLine();
+
   void MakeLevels();
+  void ClearLevels();
+
+  G4NuclearLevel* UseLevelOrMakeNew(G4NuclearLevel* level);
+  void AddDataToLevel(G4NuclearLevel* level);
+  void FinishLevel(G4NuclearLevel* level);
 
   G4int _nucleusA;
@@ -102 +112 @@
   G4bool _validity;
   G4PtrLevelVector* _levels;
-  
+
+  // Buffers for reading data file
+  char buffer[30];              // For doubles in scientific notation
   G4double _levelEnergy;
   G4double _gammaEnergy;