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

Timestamp:

Apr 20, 2009, 5:54:05 PM (17 years ago)

Author:

garnier

Message:

update to geant4.9.2

Location:

trunk/source/processes/hadronic/management

Files:

• History (modified) (1 diff)
• include/G4EnergyRangeManager.hh (modified) (1 diff)
• include/G4HadLeadBias.hh (modified) (1 diff)
• include/G4HadronicProcessStore.hh (modified) (2 diffs)
• include/G4HadronicProcessType.hh (modified) (1 diff)
• include/G4VLeadingParticleBiasing.hh (modified) (1 diff)
• src/G4EnergyRangeManager.cc (modified) (1 diff)
• 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/G4EnergyRangeManager.hh

@@ -26 +26 @@
 //
 // $Id: G4EnergyRangeManager.hh,v 1.9 2006/06/29 19:58:05 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
  // Hadronic Process: Energy Range Manager

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // --------------------------------------------------------------------

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

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

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

@@ -26 +26 @@
 //
 // $Id: G4HadronicProcessType.hh,v 1.1 2008/10/02 19:02:03 dennis Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 //

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

@@ -25 +25 @@
 //
 // $Id: G4VLeadingParticleBiasing.hh,v 1.6 2006/06/29 19:58:19 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // --------------------------------------------------------------------

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

@@ -26 +26 @@
 //
 // $Id: G4EnergyRangeManager.cc,v 1.15 2006/06/29 19:58:21 gunter Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// GEANT4 tag $Name: geant4-09-02 $
 //
  // Hadronic Process: Energy Range Manager

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

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: G4HadronicProcessStore.cc,v 1.12 2009/02/25 16:29:03 vnivanch Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: G4HadronicProcessStore.cc,v 1.7 2008/10/22 07:58:20 vnivanch Exp $
+// GEANT4 tag $Name: geant4-09-02 $
 //
 // -------------------------------------------------------------------
@@ -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
 //
 // -------------------------------------------------------------------
@@ -55 +53 @@
 #include "G4Electron.hh"
 #include "G4Proton.hh"
-#include "G4HadronicInteractionRegistry.hh"
-#include "G4CrossSectionDataSetRegistry.hh"
 
 G4HadronicProcessStore* G4HadronicProcessStore::theInstance = 0;
@@ -75 +71 @@
 G4HadronicProcessStore::~G4HadronicProcessStore()
 {
-  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;
+  /*
+  for (G4int i=0; i<n_proc; i++) {
+    if( process[i] ) delete process[i];
+  }
+  */
 }
 
@@ -360 +325 @@
 void G4HadronicProcessStore::Register(G4HadronicProcess* proc) 
 { 
-  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;
+  for(G4int i=0; i<n_proc; i++) {if(process[i] == proc) return;}
+    
   n_proc++;
   process.push_back(proc);
@@ -424 +384 @@
 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;
-      return;
+      break;
     }
   }
@@ -437 +396 @@
 void G4HadronicProcessStore::RegisterExtraProcess(G4VProcess* proc)
 {
-  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;
+  for(G4int i=0; i<n_extra; i++) {if(extraProcess[i] == proc) return;}
     
   n_extra++;
@@ -484 +437 @@
 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;
-      //G4cout << "Extra Process: " << i << " is deregisted " << G4endl;
-      return;
+      break;
     }
   }