Changeset 1055 for trunk/source/processes/hadronic/management

Timestamp:

May 28, 2009, 4:26:57 PM (15 years ago)

Author:

garnier

Message:

maj sur la beta de geant 4.9.3

Location:

trunk/source/processes/hadronic/management

Files:

• History (modified) (1 diff)
• include/G4HadronicProcessStore.hh (modified) (2 diffs)
• src/G4HadronicProcessStore.cc (modified) (8 diffs)

trunk/source/processes/hadronic/management/History

@@ -14 +14 @@
      * Please list in reverse chronological order (last date on top)
      ---------------------------------------------------------------
+
+25 February 2009 Vladimir Ivanchenko (hadr-man-V09-02-04)
+---------------------------------------------------------
+- G4HadronicProcessStore - added protection to the Clean method 
+
+22 February 2009 Vladimir Ivanchenko (hadr-man-V09-02-03)
+---------------------------------------------------------
+
+14 February 2009 Vladimir Ivanchenko (hadr-man-V09-02-02)
+---------------------------------------------------------
+- G4HadronicProcessStore - added Clean method and cleanup of model 
+                           and cross section stores
+
+06 February 2009 Vladimir Ivanchenko (hadr-man-V09-02-01)
+---------------------------------------------------------
+
+24 January 2009 Vladimir Ivanchenko (hadr-man-V09-02-00)
+-------------------------------------------------------
+- G4HadronicProcessStore - added destruction of processes
 
 01 December 2008 Dennis Wright (hadr-man-V09-01-10)

trunk/source/processes/hadronic/management/include/G4HadronicProcessStore.hh

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronicProcessStore.hh,v 1.3 2008/10/22 07:58:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4HadronicProcessStore.hh,v 1.5 2009/02/15 16:50:15 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
 //
 //
@@ -72 +72 @@
   ~G4HadronicProcessStore();
 
+  void Clean();
+
   G4double GetInelasticCrossSectionPerVolume(
     const G4ParticleDefinition *aParticle,

trunk/source/processes/hadronic/management/src/G4HadronicProcessStore.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronicProcessStore.cc,v 1.7 2008/10/22 07:58:20 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02 $
+// $Id: G4HadronicProcessStore.cc,v 1.12 2009/02/25 16:29:03 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-03-beta-cand-01 $
 //
 // -------------------------------------------------------------------
@@ -39 +39 @@
 //
 // Modifications:
-//
+// 23.01.2009 V.Ivanchenko add destruction of processes
 //
 // Class Description:
+// Singleton to store hadronic processes, to provide access to processes
+// and to printout information about processes
 //
 // -------------------------------------------------------------------
@@ -53 +55 @@
 #include "G4Electron.hh"
 #include "G4Proton.hh"
+#include "G4HadronicInteractionRegistry.hh"
+#include "G4CrossSectionDataSetRegistry.hh"
 
 G4HadronicProcessStore* G4HadronicProcessStore::theInstance = 0;
@@ -71 +75 @@
 G4HadronicProcessStore::~G4HadronicProcessStore()
 {
-  /*
-  for (G4int i=0; i<n_proc; i++) {
-    if( process[i] ) delete process[i];
-  }
-  */
+  Clean();
+  G4HadronicInteractionRegistry::Instance()->Clean();
+  G4CrossSectionDataSetRegistry::Instance()->Clean();
+}
+
+//....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo.....
+
+void G4HadronicProcessStore::Clean()
+{
+  G4int i;
+  //G4cout << "G4HadronicProcessStore::Clean() Nproc= " << n_proc
+  //     << "  Nextra= " << n_extra << G4endl;
+  if(n_proc > 0) {
+    for (i=0; i<n_proc; i++) {
+      if( process[i] ) {
+        //G4cout << "G4HadronicProcessStore::Clean() delete hadronic " << i << G4endl;
+        //G4cout <<  process[i]->GetProcessName() << G4endl;
+        delete process[i];
+        process[i] = 0;
+      }
+    }
+  }
+  if(n_extra > 0) {
+    for(i=0; i<n_extra; i++) {
+      if(extraProcess[i]) {
+        //G4cout << "G4HadronicProcessStore::Clean() delete extra "  
+        //       << i << G4endl;
+        //G4cout << extraProcess[i]->GetProcessName() << G4endl;
+        delete extraProcess[i];
+        extraProcess[i] = 0;
+      }
+    }
+  }
+  //G4cout << "G4HadronicProcessStore::Clean() done" << G4endl; 
+  n_extra = 0;
+  n_proc = 0;
 }
 
@@ -325 +360 @@
 void G4HadronicProcessStore::Register(G4HadronicProcess* proc) 
 { 
-  for(G4int i=0; i<n_proc; i++) {if(process[i] == proc) return;}
-    
+  if(0 < n_proc) {
+    for(G4int i=0; i<n_proc; i++) {
+      if(process[i] == proc) return;
+    }
+  }
+  //G4cout << "G4HadronicProcessStore::Register hadronic " << n_proc
+  //     << "  " << proc->GetProcessName() << G4endl;
   n_proc++;
   process.push_back(proc);
@@ -384 +424 @@
 void G4HadronicProcessStore::DeRegister(G4HadronicProcess* proc)
 {
+  if(0 == n_proc) return;
   for(G4int i=0; i<n_proc; i++) {
     if(process[i] == proc) {
       process[i] = 0;
-      break;
+      return;
     }
   }
@@ -396 +437 @@
 void G4HadronicProcessStore::RegisterExtraProcess(G4VProcess* proc)
 {
-  for(G4int i=0; i<n_extra; i++) {if(extraProcess[i] == proc) return;}
+  if(0 < n_extra) {
+    for(G4int i=0; i<n_extra; i++) {
+      if(extraProcess[i] == proc) return;
+    }
+  }
+  //G4cout << "Extra Process: " << n_extra << "  " <<  proc->GetProcessName() 
+  //     << "  " << proc << G4endl;
     
   n_extra++;
@@ -437 +484 @@
 void G4HadronicProcessStore::DeRegisterExtraProcess(G4VProcess* proc)
 {
+  //G4cout << "Deregister Extra Process: " << proc << "   " << proc->GetProcessName() << G4endl;
+  if(0 == n_extra) return;
   for(G4int i=0; i<n_extra; i++) {
     if(extraProcess[i] == proc) {
       extraProcess[i] = 0;
-      break;
+      //G4cout << "Extra Process: " << i << " is deregisted " << G4endl;
+      return;
     }
   }