Changeset 961 for trunk/source/processes/cuts/src

Timestamp:

Apr 6, 2009, 12:21:12 PM (17 years ago)

Author:

garnier

Message:

update processes

Location:

trunk/source/processes/cuts/src

Files:

• G4MCCIndexConversionTable.cc (modified) (1 diff)
• G4MaterialCutsCouple.cc (modified) (1 diff)
• G4PhysicsTableHelper.cc (modified) (1 diff)
• G4ProductionCuts.cc (modified) (1 diff)
• G4ProductionCutsTable.cc (modified) (11 diffs)
• G4RToEConvForAntiNeutron.cc (modified) (1 diff)
• G4RToEConvForAntiProton.cc (modified) (1 diff)
• G4RToEConvForElectron.cc (modified) (1 diff)
• G4RToEConvForGamma.cc (modified) (1 diff)
• G4RToEConvForNeutron.cc (modified) (1 diff)
• G4RToEConvForPositron.cc (modified) (1 diff)
• G4RToEConvForProton.cc (modified) (1 diff)
• G4VRangeToEnergyConverter.cc (modified) (3 diffs)

trunk/source/processes/cuts/src/G4MCCIndexConversionTable.cc

@@ -25 +25 @@
 //
 // $Id: G4MCCIndexConversionTable.cc,v 1.3 2006/06/29 19:30:08 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/processes/cuts/src/G4MaterialCutsCouple.cc

@@ -26 +26 @@
 //
 // $Id: G4MaterialCutsCouple.cc,v 1.3 2006/06/29 19:30:10 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/processes/cuts/src/G4PhysicsTableHelper.cc

@@ -25 +25 @@
 //
 // $Id: G4PhysicsTableHelper.cc,v 1.5 2006/06/29 19:30:12 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 // 

trunk/source/processes/cuts/src/G4ProductionCuts.cc

@@ -26 +26 @@
 //
 // $Id: G4ProductionCuts.cc,v 1.5 2006/06/29 19:30:14 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/processes/cuts/src/G4ProductionCutsTable.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4ProductionCutsTable.cc,v 1.17 2007/05/30 08:22:20 kurasige Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4ProductionCutsTable.cc,v 1.18 2008/03/02 10:52:55 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -32 +32 @@
 //      GEANT 4 class implementation file/  History:
 //    06/Oct. 2002, M.Asai : First implementation
+//    02/Mar. 2008, H.Kurashige : Add messenger
 // --------------------------------------------------------------
 
@@ -37 +38 @@
 #include "G4ProductionCuts.hh"
 #include "G4MCCIndexConversionTable.hh"
+#include "G4ProductionCutsTableMessenger.hh"
 #include "G4ParticleDefinition.hh"
 #include "G4ParticleTable.hh"
@@ -66 +68 @@
 
 G4ProductionCutsTable::G4ProductionCutsTable()
-  : firstUse(true),verboseLevel(1)
+  : firstUse(true),verboseLevel(1),fMessenger(0)
 {
   for(size_t i=0;i< NumberOfG4CutIndex;i++)
@@ -78 +80 @@
   fG4RegionStore = G4RegionStore::GetInstance();
   defaultProductionCuts = new G4ProductionCuts();
+
+  // add messenger for UI 
+  fMessenger = new G4ProductionCutsTableMessenger(this);
 }
 
@@ -103 +108 @@
   }
   fG4ProductionCutsTable =0;
+
+  if (fMessenger !=0) delete fMessenger;
+  fMessenger = 0;
 }
 
@@ -108 +116 @@
 {
   if(firstUse){
-    if(G4ParticleTable::GetParticleTable()->FindParticle("gamma"))
-    { converters[0] = new G4RToEConvForGamma(); }
-    if(G4ParticleTable::GetParticleTable()->FindParticle("e-"))
-    { converters[1] = new G4RToEConvForElectron(); }
-    if(G4ParticleTable::GetParticleTable()->FindParticle("e+"))
-    { converters[2] = new G4RToEConvForPositron(); }
+    if(G4ParticleTable::GetParticleTable()->FindParticle("gamma")){
+      converters[0] = new G4RToEConvForGamma(); 
+      converters[0]->SetVerboseLevel(GetVerboseLevel());
+    }
+    if(G4ParticleTable::GetParticleTable()->FindParticle("e-")){
+      converters[1] = new G4RToEConvForElectron(); 
+      converters[1]->SetVerboseLevel(GetVerboseLevel());
+        }
+    if(G4ParticleTable::GetParticleTable()->FindParticle("e+")){
+      converters[2] = new G4RToEConvForPositron(); 
+      converters[2]->SetVerboseLevel(GetVerboseLevel());
+    }
     firstUse = false;
   }
@@ -376 +390 @@
   
 #ifdef G4VERBOSE  
-  if (verboseLevel >1) {
+  if (verboseLevel >2) {
     G4cout << "G4ProductionCutsTable::StoreCutsTable " ;
     G4cout << " Material/Cuts information have been succesfully stored ";
@@ -396 +410 @@
   if (!RetrieveCutsInfo(dir, ascii)) return false;
 #ifdef G4VERBOSE  
-  if (verboseLevel >1) {
+  if (verboseLevel >2) {
     G4cout << "G4ProductionCutsTable::RetrieveCutsTable " ;
     G4cout << " Material/Cuts information have been succesfully retreived ";
@@ -420 +434 @@
   //  isNeedForRestoreCoupleInfo = false;
   if (!CheckMaterialInfo(directory, ascii)) return false;
-  if (verboseLevel >1) {
+  if (verboseLevel >2) {
       G4cerr << "G4ProductionCutsTable::CheckMaterialInfo  passed !!"<< G4endl;
   }
   if (!CheckMaterialCutsCoupleInfo(directory, ascii)) return false;
-  if (verboseLevel >1) {
+  if (verboseLevel >2) {
     G4cerr << "G4ProductionCutsTable::CheckMaterialCutsCoupleInfo  passed !!"<< G4endl;
   }
@@ -1080 +1094 @@
   return true;
 }
+
+// Set Verbose Level 
+//   set same verbosity to all registered RangeToEnergyConverters  
+ void G4ProductionCutsTable::SetVerboseLevel(G4int value)
+{
+  verboseLevel = value;
+  for (int ip=0; ip< NumberOfG4CutIndex; ip++) {
+    if (converters[ip] !=0 ){
+      converters[ip]->SetVerboseLevel(value);
+    }
+  }
+}
+

trunk/source/processes/cuts/src/G4RToEConvForAntiNeutron.cc

@@ -26 +26 @@
 //
 // $Id: G4RToEConvForAntiNeutron.cc,v 1.3 2006/06/29 19:30:18 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/processes/cuts/src/G4RToEConvForAntiProton.cc

@@ -26 +26 @@
 //
 // $Id: G4RToEConvForAntiProton.cc,v 1.3 2006/06/29 19:30:20 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/processes/cuts/src/G4RToEConvForElectron.cc

@@ -26 +26 @@
 //
 // $Id: G4RToEConvForElectron.cc,v 1.5 2006/06/29 19:30:22 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/processes/cuts/src/G4RToEConvForGamma.cc

@@ -26 +26 @@
 //
 // $Id: G4RToEConvForGamma.cc,v 1.4 2006/06/29 19:30:24 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/processes/cuts/src/G4RToEConvForNeutron.cc

@@ -26 +26 @@
 //
 // $Id: G4RToEConvForNeutron.cc,v 1.3 2006/06/29 19:30:26 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/processes/cuts/src/G4RToEConvForPositron.cc

@@ -26 +26 @@
 //
 // $Id: G4RToEConvForPositron.cc,v 1.5 2006/06/29 19:30:28 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/processes/cuts/src/G4RToEConvForProton.cc

@@ -26 +26 @@
 //
 // $Id: G4RToEConvForProton.cc,v 1.3 2006/06/29 19:30:30 gunter Exp $
-// GEANT4 tag $Name:  $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //

trunk/source/processes/cuts/src/G4VRangeToEnergyConverter.cc

@@ -25 +25 @@
 //
 //
-// $Id: G4VRangeToEnergyConverter.cc,v 1.8 2007/06/06 05:13:34 urban Exp $
-// GEANT4 tag $Name: geant4-09-01-patch-02 $
+// $Id: G4VRangeToEnergyConverter.cc,v 1.9 2008/03/02 10:52:56 kurasige Exp $
+// GEANT4 tag $Name: geant4-09-02-ref-02 $
 //
 //
@@ -274 +274 @@
     theLossTable->reserve(G4Element::GetNumberOfElements());
 #ifdef G4VERBOSE
-    if (GetVerboseLevel()>2) {
+    if (GetVerboseLevel()>3) {
       G4cout << "G4VRangeToEnergyConverter::BuildLossTable() ";
       G4cout << "Create theLossTable[" << theLossTable << "]";
@@ -447 +447 @@
   if ( theCutInLength >= rmax )  {
 #ifdef G4VERBOSE
-    if (GetVerboseLevel()>0) {
+    if (GetVerboseLevel()>2) {
       G4cout << "G4VRangeToEnergyConverter::ConvertCutToKineticEnergy ";
       G4cout << "  for " << theParticle->GetParticleName() << G4endl;