X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=TGeant4%2FTG4G3Defaults.cxx;h=874f4803073ca92bfd58c4bd63113f209fbfddb4;hb=bf71e087a61f9ead5fa294e0fbd6777dca718a73;hp=98b3731554785785a601c4a681a306d5b7b85d41;hpb=c63f260d2ce68639d30d71a5738e4f4076c89bd6;p=u%2Fmrichter%2FAliRoot.git

diff --git a/TGeant4/TG4G3Defaults.cxx b/TGeant4/TG4G3Defaults.cxx
index 98b37315547..874f4803073 100644
--- 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() {
 //
@@ -54,84 +54,86 @@ G4double TG4G3Defaults::CutValue(G4int g3Cut)
 
   switch (g3Cut) {
     case kCUTGAM:  
-      return fgkCUTGAM; break;
+      return fgkCUTGAM;
     case kCUTELE:  
-      return fgkCUTELE; break;
+      return fgkCUTELE;
     case kCUTNEU:  
-      return fgkCUTNEU; break;
+      return fgkCUTNEU;
     case kCUTHAD:  
-      return fgkCUTHAD; break;
+      return fgkCUTHAD;
     case kCUTMUO:  
-      return fgkCUTMUO; break;
+      return fgkCUTMUO;
     case kBCUTE:   
-      return fgkBCUTE;  break;
+      return fgkBCUTE; 
     case kBCUTM:   
-      return fgkBCUTM;  break; 
+      return fgkBCUTM; 
     case kDCUTE:   
-      return fgkDCUTE;  break;
+      return fgkDCUTE; 
     case kDCUTM:   
-      return fgkDCUTM;  break;
+      return fgkDCUTM; 
     case kPPCUTM:  
-      return fgkPPCUTM; break;
+      return fgkPPCUTM;
     default:
       TG4Globals::Warning("TG4G3Defaults::CutValue: Inconsistent cut.");
       return 0.;      
   }
 }          
 
-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; break;
+      return fgkPAIR;
     case kCOMP:
-      return fgkCOMP; break;
+      return fgkCOMP;
     case kPHOT:
-      return fgkPHOT; break;
+      return fgkPHOT;
     case kPFIS:
-      return fgkPFIS; break;
+      return fgkPFIS;
     case kDRAY:
-      return fgkDRAY; break;
+      return fgkDRAY;
     case kANNI:
-      return fgkANNI; break;
+      return fgkANNI;
     case kBREM:
-      return fgkBREM; break;
+      return fgkBREM;
     case kHADR:
-      return fgkHADR; break;
+      return fgkHADR;
     case kMUNU:
-      return fgkMUNU; break;
+      return fgkMUNU;
     case kDCAY:
-      return fgkDCAY; break;
+      return fgkDCAY;
     case kLOSS:
-      return fgkLOSS; break;
+      return fgkLOSS;
     case kMULS:
-      return fgkMULS; break;
+      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;