Changeset 1347 for trunk/source/persistency/mctruth

Timestamp:

Dec 22, 2010, 3:52:27 PM (14 years ago)

Author:

garnier

Message:

geant4 tag 9.4

Location:

trunk/source/persistency/mctruth

Files:

• include/G4PersistencyCenter.hh (modified) (1 diff)
• src/G4MCTSimParticle.cc (modified) (1 diff)
• src/G4MCTSimVertex.cc (modified) (1 diff)
• src/G4PersistencyCenter.cc (modified) (5 diffs)

trunk/source/persistency/mctruth/include/G4PersistencyCenter.hh

@@ -37 +37 @@
 #include <map>
 #include "G4HCIOcatalog.hh"
-#include "G4VHCIOentry.hh"
 #include "G4DCIOcatalog.hh"
-#include "G4VDCIOentry.hh"
 
 #ifndef WIN32

trunk/source/persistency/mctruth/src/G4MCTSimParticle.cc

@@ -43 +43 @@
 /////////////////////////////////
 G4MCTSimParticle::G4MCTSimParticle()
-  : parentParticle(0), 
+  : parentParticle(0), pdgID(0),
     trackID(0), parentTrackID(0),
     primaryFlag(false), 

trunk/source/persistency/mctruth/src/G4MCTSimVertex.cc

@@ -43 +43 @@
 /////////////////////////////////////
 G4MCTSimVertex::G4MCTSimVertex()  
-  : inParticleTrackID(0),id(-1), 
+  : inParticleTrackID(0),id(-1), time(0.),
     volumeName(""), volumeNumber(-1),
     creatorProcessName("none"),

trunk/source/persistency/mctruth/src/G4PersistencyCenter.cc

@@ -37 +37 @@
 #include "G4UImanager.hh"
 #include "G4PersistencyManager.hh"
+#include "G4VHCIOentry.hh"
+#include "G4VDCIOentry.hh"
 
 G4PersistencyCenter* G4PersistencyCenter::f_thePointer=G4PersistencyCenter::GetPersistencyCenter();
@@ -74 +76 @@
 }
 
-// Implementation of Constructor #2
-G4PersistencyCenter::G4PersistencyCenter(const G4PersistencyCenter&)
-{}
+// Fake implementation of Copy Constructor
+G4PersistencyCenter::G4PersistencyCenter(const G4PersistencyCenter& c)
+  : f_theMessenger(0), f_currentManager(0), m_verbose(0)
+{
+  *this = c;
+}
 
 // Implementation of Destructor #1
@@ -96 +101 @@
 void G4PersistencyCenter::SelectSystem(std::string systemName)
 {
-  int st = 0;
+  G4int st = 0;
 
   if (f_currentManager!=0) delete f_currentManager;
@@ -102 +107 @@
   G4PersistencyManager* pm = 0;
 
-  if (systemName=="None")
-  {
-    G4cout<<" G4PersistencyCenter: Default is selected."<< G4endl;
-    pm = new G4PersistencyManager(this, "Default");
-  }
-  else if (systemName=="ROOT")
+  if (systemName=="ROOT")
   {
     G4cout<<" G4PersistencyCenter: \"ROOT\" Persistency Package is selected."
@@ -128 +128 @@
     }
   }
+  else
+  {
+    G4cout<<" G4PersistencyCenter: Default is selected."<< G4endl;
+    pm = new G4PersistencyManager(this, "Default");
+  }
+
   if ( st == 0 ) {
     f_currentManager = pm->Create();