updated to renaming in physics category

diff --git a/TGeant4/TG4G3Defaults.cxx b/TGeant4/TG4G3Defaults.cxx
index a0c5b290b10e6ffcdcf9ed17151cf0bedcb8ce79..874f4803073ca92bfd58c4bd63113f209fbfddb4 100644 (file)
--- a/TGeant4/TG4G3Defaults.cxx
+++ b/TGeant4/TG4G3Defaults.cxx
@@ -26,18 +26,18 @@ const G4double TG4G3Defaults::fgkDCUTM  = 10. * TeV;
 const G4double TG4G3Defaults::fgkPPCUTM = 0.01 * GeV;
 
 // physics processes
-const TG3FlagValue TG4G3Defaults::fgkPAIR = kActivate;   // 1
-const TG3FlagValue TG4G3Defaults::fgkCOMP = kActivate;   // 1
-const TG3FlagValue TG4G3Defaults::fgkPHOT = kActivate;   // 1
-const TG3FlagValue TG4G3Defaults::fgkPFIS = kInActivate; // 0
-const TG3FlagValue TG4G3Defaults::fgkDRAY = kActivate2;  // 2
-const TG3FlagValue TG4G3Defaults::fgkANNI = kActivate;   // 1
-const TG3FlagValue TG4G3Defaults::fgkBREM = kActivate;   // 1
-const TG3FlagValue TG4G3Defaults::fgkHADR = kActivate;   // 1
-const TG3FlagValue TG4G3Defaults::fgkMUNU = kInActivate; // 0
-const TG3FlagValue TG4G3Defaults::fgkDCAY = kActivate;   // 1
-const TG3FlagValue TG4G3Defaults::fgkLOSS = kActivate2;  // 2
-const TG3FlagValue TG4G3Defaults::fgkMULS = kActivate;   // 1
+const TG4G3ControlValue TG4G3Defaults::fgkPAIR = kActivate;   // 1
+const TG4G3ControlValue TG4G3Defaults::fgkCOMP = kActivate;   // 1
+const TG4G3ControlValue TG4G3Defaults::fgkPHOT = kActivate;   // 1
+const TG4G3ControlValue TG4G3Defaults::fgkPFIS = kInActivate; // 0
+const TG4G3ControlValue TG4G3Defaults::fgkDRAY = kActivate2;  // 2
+const TG4G3ControlValue TG4G3Defaults::fgkANNI = kActivate;   // 1
+const TG4G3ControlValue TG4G3Defaults::fgkBREM = kActivate;   // 1
+const TG4G3ControlValue TG4G3Defaults::fgkHADR = kActivate;   // 1
+const TG4G3ControlValue TG4G3Defaults::fgkMUNU = kInActivate; // 0
+const TG4G3ControlValue TG4G3Defaults::fgkDCAY = kActivate;   // 1
+const TG4G3ControlValue TG4G3Defaults::fgkLOSS = kActivate2;  // 2
+const TG4G3ControlValue TG4G3Defaults::fgkMULS = kActivate;   // 1
 
 TG4G3Defaults::TG4G3Defaults() {
 //
@@ -79,12 +79,12 @@ G4double TG4G3Defaults::CutValue(G4int g3Cut)
   }
 }          
 
-TG3FlagValue TG4G3Defaults::FlagValue(G4int g3Flag)
+TG4G3ControlValue TG4G3Defaults::ControlValue(G4int control)
 {
-// Returns the G3 default value for the specified flag.
+// Returns the G3 default value for the specified control.
 // ---
 
-  switch (g3Flag) {
+  switch (control) {
     case kPAIR:
       return fgkPAIR;
     case kCOMP:
@@ -110,28 +110,30 @@ TG3FlagValue TG4G3Defaults::FlagValue(G4int g3Flag)
     case kMULS:
       return fgkMULS;
     default:
-      TG4Globals::Warning("TG4G3Defaults::FlagValue: Inconsistent flag.");
+      TG4Globals::Warning(
+        "TG4G3Defaults::ControlValue: Inconsistent control.");
       return kUnset;      
   }
 }          
 
-G4bool TG4G3Defaults::IsDefaultCut(TG3Cut g3Cut, G4double value)
+G4bool TG4G3Defaults::IsDefaultCut(TG4G3Cut cut, G4double value)
 {
 // Tests if the parameter value is equal to the G3 default value.
 // ---
 
-  if (abs(value*GeV - CutValue(g3Cut)) > fgkCutTolerance) 
+  if (abs(value*GeV - CutValue(cut)) > fgkCutTolerance) 
     return false;
   else  
     return true;
 }
 
-G4bool TG4G3Defaults::IsDefaultFlag(TG3Flag g3Flag, G4double value)
+G4bool TG4G3Defaults::IsDefaultControl(TG4G3Control control,
+                                              G4double value)
 {
 // Tests if the parameter value is equal to the G3 default value.
 // ---
 
-  if (value == FlagValue(g3Flag)) 
+  if (value == ControlValue(control)) 
     return true;
   else  
     return false;

diff --git a/TGeant4/TG4G3Defaults.h b/TGeant4/TG4G3Defaults.h
index f446bb4e4105b660a54fc4bbc6bbd5d5f3a18438..caefce4f5ec27e29d8d8e297dd37203f1b8a65e9 100644 (file)
--- a/TGeant4/TG4G3Defaults.h
+++ b/TGeant4/TG4G3Defaults.h
@@ -2,13 +2,13 @@
 // Category: physics
 //
 // Class stores the default G3 values of the kinetic energy cuts
-// for particles and the control process flags parameters
+// for particles and the control process parameters
 
-#ifndef TG4_G3DEFAULTS_H
-#define TG4_G3DEFAULTS_H
+#ifndef TG4_G3_DEFAULTS_H
+#define TG4_G3_DEFAULTS_H
 
-#include "TG3Cut.h"
-#include "TG3Flag.h"
+#include "TG4G3Cut.h"
+#include "TG4G3Control.h"
 
 #include <globals.hh>
 
@@ -20,14 +20,14 @@ class TG4G3Defaults
     virtual ~TG4G3Defaults();
 
     // static methods
-    static G4bool IsDefaultCut(TG3Cut g3Cut, G4double value); 
-    static G4bool IsDefaultFlag(TG3Flag g3Flag, G4double value); 
+    static G4bool IsDefaultCut(TG4G3Cut cut, G4double value); 
+    static G4bool IsDefaultControl(TG4G3Control control, G4double value); 
 
     // static get methods
        // precision tolerance
     static G4double CutTolerance();
-    static G4double CutValue(G4int g3Cut);   
-    static TG3FlagValue FlagValue(G4int g3Flag); 
+    static G4double CutValue(G4int cut);   
+    static TG4G3ControlValue ControlValue(G4int control); 
       
   protected:
     TG4G3Defaults();      
@@ -49,23 +49,23 @@ class TG4G3Defaults
     static const G4double fgkDCUTE;    //DCUTE default value
     static const G4double fgkDCUTM;    //DCUTM default value
     static const G4double fgkPPCUTM;   //PPCUTM default value
-       // physics processes flags
-    static const TG3FlagValue fgkPAIR; //PAIR default value   
-    static const TG3FlagValue fgkCOMP; //COMP default value   
-    static const TG3FlagValue fgkPHOT; //PHOT default value   
-    static const TG3FlagValue fgkPFIS; //PFIS default value   
-    static const TG3FlagValue fgkDRAY; //DRAY default value  
-    static const TG3FlagValue fgkANNI; //ANNI default value   
-    static const TG3FlagValue fgkBREM; //BREM default value  
-    static const TG3FlagValue fgkHADR; //HADR default value   
-    static const TG3FlagValue fgkMUNU; //MUNU default value   
-    static const TG3FlagValue fgkDCAY; //DCAY default value  
-    static const TG3FlagValue fgkLOSS; //LOSS default value  
-    static const TG3FlagValue fgkMULS; //MULS default value  
+       // physics processes controls
+    static const TG4G3ControlValue fgkPAIR; //PAIR default value   
+    static const TG4G3ControlValue fgkCOMP; //COMP default value   
+    static const TG4G3ControlValue fgkPHOT; //PHOT default value   
+    static const TG4G3ControlValue fgkPFIS; //PFIS default value   
+    static const TG4G3ControlValue fgkDRAY; //DRAY default value  
+    static const TG4G3ControlValue fgkANNI; //ANNI default value   
+    static const TG4G3ControlValue fgkBREM; //BREM default value  
+    static const TG4G3ControlValue fgkHADR; //HADR default value   
+    static const TG4G3ControlValue fgkMUNU; //MUNU default value   
+    static const TG4G3ControlValue fgkDCAY; //DCAY default value  
+    static const TG4G3ControlValue fgkLOSS; //LOSS default value  
+    static const TG4G3ControlValue fgkMULS; //MULS default value  
 };     
 
 // inline methods
 
 inline G4double TG4G3Defaults::CutTolerance() { return fgkCutTolerance; }
 
-#endif //ALI_G3DEFAULTS_H
+#endif //ALI_G3_DEFAULTS_H