From c63f260d2ce68639d30d71a5738e4f4076c89bd6 Mon Sep 17 00:00:00 2001 From: ivana Date: Mon, 17 Jul 2000 07:05:24 +0000 Subject: [PATCH] renamed static data members (change of coding conventions) --- AliGeant4/AliFiles.cxx | 24 ++++----- AliGeant4/AliFiles.h | 46 ++++++++--------- AliGeant4/AliGlobals.cxx | 2 +- AliGeant4/AliGlobals.h | 4 +- AliGeant4/AliSteppingAction.cxx | 6 +-- AliGeant4/AliSteppingAction.h | 3 +- TGeant4/TG3Units.cxx | 16 +++--- TGeant4/TG3Units.h | 32 ++++++------ TGeant4/TG4G3Defaults.cxx | 92 ++++++++++++++++----------------- TGeant4/TG4G3Defaults.h | 48 ++++++++--------- 10 files changed, 137 insertions(+), 136 deletions(-) diff --git a/AliGeant4/AliFiles.cxx b/AliGeant4/AliFiles.cxx index c3d30f4a819..8c2c1fa60f3 100644 --- a/AliGeant4/AliFiles.cxx +++ b/AliGeant4/AliFiles.cxx @@ -9,18 +9,18 @@ // static data members -const G4String AliFiles::fgTop = getenv("AG4_INSTALL"); -const G4String AliFiles::fgConfig = fgTop + "/../macros/Config.C"; -const G4String AliFiles::fgDetConfig1 = fgTop + "/macro/"; -const G4String AliFiles::fgDetConfig2 = "/Config"; -const G4String AliFiles::fgDetConfig3 = ".C"; -const G4String AliFiles::fgDetConfig4 = ".in"; -const G4String AliFiles::fgDetConfigName1 = "Config("; -const G4String AliFiles::fgDetConfigName2 = ")"; -const G4String AliFiles::fgDetData1 = fgTop + "/macro/"; -const G4String AliFiles::fgDetData2 = "/g3calls_"; -const G4String AliFiles::fgDetData3 = ".dat"; -const G4String AliFiles::fgSTRUCT = "STRUCT/"; +const G4String AliFiles::fgkTop = getenv("AG4_INSTALL"); +const G4String AliFiles::fgkConfig = fgkTop + "/../macros/Config.C"; +const G4String AliFiles::fgkDetConfig1 = fgkTop + "/macro/"; +const G4String AliFiles::fgkDetConfig2 = "/Config"; +const G4String AliFiles::fgkDetConfig3 = ".C"; +const G4String AliFiles::fgkDetConfig4 = ".in"; +const G4String AliFiles::fgkDetConfigName1 = "Config("; +const G4String AliFiles::fgkDetConfigName2 = ")"; +const G4String AliFiles::fgkDetData1 = fgkTop + "/macro/"; +const G4String AliFiles::fgkDetData2 = "/g3calls_"; +const G4String AliFiles::fgkDetData3 = ".dat"; +const G4String AliFiles::fgkSTRUCT = "STRUCT/"; AliFiles::AliFiles() { // diff --git a/AliGeant4/AliFiles.h b/AliGeant4/AliFiles.h index d259cff2340..b0c8bbe7edf 100644 --- a/AliGeant4/AliFiles.h +++ b/AliGeant4/AliFiles.h @@ -40,53 +40,53 @@ class AliFiles private: // static data members - static const G4String fgTop; //top directory - static const G4String fgConfig; //path to general Config.C - static const G4String fgDetConfig1; //path (part 1) to module Config.C/in - static const G4String fgDetConfig2; //path (part 2) to module Config.C/in - static const G4String fgDetConfig3; //path (part 3) to module Config.C/in - static const G4String fgDetConfig4; //path (part 2) to module Config.C/in - static const G4String fgDetConfigName1; //config macro name (part 1) - static const G4String fgDetConfigName2; //config macro name (part 2) - static const G4String fgDetData1; //path (part 1) to module g3calls.dat - static const G4String fgDetData2; //path (part 2) to module g3calls.dat - static const G4String fgDetData3; //path (part 3) to module g3calls.dat - static const G4String fgSTRUCT; //structure directory name + static const G4String fgkTop; //top directory + static const G4String fgkConfig; //path to general Config.C + static const G4String fgkDetConfig1; //path (part 1) to module Config.C/in + static const G4String fgkDetConfig2; //path (part 2) to module Config.C/in + static const G4String fgkDetConfig3; //path (part 3) to module Config.C/in + static const G4String fgkDetConfig4; //path (part 2) to module Config.C/in + static const G4String fgkDetConfigName1; //config macro name (part 1) + static const G4String fgkDetConfigName2; //config macro name (part 2) + static const G4String fgkDetData1; //path (part 1) to module g3calls.dat + static const G4String fgkDetData2; //path (part 2) to module g3calls.dat + static const G4String fgkDetData3; //path (part 3) to module g3calls.dat + static const G4String fgkSTRUCT; //structure directory name }; // inline methods inline G4String AliFiles::Config() -{ return fgConfig; } +{ return fgkConfig; } inline G4String AliFiles::DetConfig1() -{ return fgDetConfig1; } +{ return fgkDetConfig1; } inline G4String AliFiles::DetConfig2() -{ return fgDetConfig2; } +{ return fgkDetConfig2; } inline G4String AliFiles::DetConfig3() -{ return fgDetConfig3; } +{ return fgkDetConfig3; } inline G4String AliFiles::DetConfig4() -{ return fgDetConfig4; } +{ return fgkDetConfig4; } inline G4String AliFiles::DetConfigName1() -{ return fgDetConfigName1; } +{ return fgkDetConfigName1; } inline G4String AliFiles::DetConfigName2() -{ return fgDetConfigName2; } +{ return fgkDetConfigName2; } inline G4String AliFiles::DetData1() -{ return fgDetData1; } +{ return fgkDetData1; } inline G4String AliFiles::DetData2() -{ return fgDetData2; } +{ return fgkDetData2; } inline G4String AliFiles::DetData3() -{ return fgDetData3; } +{ return fgkDetData3; } inline G4String AliFiles::STRUCT() -{ return fgSTRUCT; } +{ return fgkSTRUCT; } #endif //ALI_FILES_H diff --git a/AliGeant4/AliGlobals.cxx b/AliGeant4/AliGlobals.cxx index ca9ca1517ec..545edf7509f 100644 --- a/AliGeant4/AliGlobals.cxx +++ b/AliGeant4/AliGlobals.cxx @@ -8,7 +8,7 @@ #include // static data members -const G4double AliGlobals::fgDefaultCut = 2.0*mm; +const G4double AliGlobals::fgkDefaultCut = 2.0*mm; AliGlobals::AliGlobals() { // diff --git a/AliGeant4/AliGlobals.h b/AliGeant4/AliGlobals.h index 69504abf6e6..8a6101d84bb 100644 --- a/AliGeant4/AliGlobals.h +++ b/AliGeant4/AliGlobals.h @@ -47,12 +47,12 @@ class AliGlobals private: // static data members - static const G4double fgDefaultCut; //default cut value + static const G4double fgkDefaultCut; //default cut value }; // inline methods inline G4double AliGlobals::DefaultCut() -{ return fgDefaultCut; } +{ return fgkDefaultCut; } #endif //ALI_GLOBALS_H diff --git a/AliGeant4/AliSteppingAction.cxx b/AliGeant4/AliSteppingAction.cxx index 6ae992716ed..f60c44a8c7a 100644 --- a/AliGeant4/AliSteppingAction.cxx +++ b/AliGeant4/AliSteppingAction.cxx @@ -10,7 +10,7 @@ #include #include -const G4double AliSteppingAction::fgTolerance = 1e-6*mm; +const G4double AliSteppingAction::fgkTolerance = 1e-6*mm; AliSteppingAction::AliSteppingAction() : fKeptStepPoint(G4ThreeVector()), @@ -104,7 +104,7 @@ void AliSteppingAction::UserSteppingAction(const G4Step* step) { // After processing the given number of steps (kCheckNofSteps) // the particle position is compared with the previus one -// - in case the distance is less than fgTolerance value +// - in case the distance is less than fgkTolerance value // the verbose mode is switched on, particle is let // to process a small number of steps (kMaxNofLoopSteps) // and then stopped and killed. @@ -140,7 +140,7 @@ void AliSteppingAction::UserSteppingAction(const G4Step* step) // detect looping track G4ThreeVector newStepPoint = step->GetPreStepPoint()->GetPosition(); G4double trajectory = (newStepPoint-fKeptStepPoint).mag(); - if (trajectory < fgTolerance) { + if (trajectory < fgkTolerance) { // print looping info if (fLoopVerboseLevel > 0) { diff --git a/AliGeant4/AliSteppingAction.h b/AliGeant4/AliSteppingAction.h index 90f40a582ff..8d59156f565 100644 --- a/AliGeant4/AliSteppingAction.h +++ b/AliGeant4/AliSteppingAction.h @@ -47,7 +47,8 @@ class AliSteppingAction : public G4UserSteppingAction void PrintTrackInfo(const G4Track* track) const; // static data members - static const G4double fgTolerance; + static const G4double fgkTolerance; //tolerance used in detecting + //of looping particles // data members G4ThreeVector fKeptStepPoint; //kept step point diff --git a/TGeant4/TG3Units.cxx b/TGeant4/TG3Units.cxx index f40200b0de7..e6a1446a598 100644 --- a/TGeant4/TG3Units.cxx +++ b/TGeant4/TG3Units.cxx @@ -7,14 +7,14 @@ // static const data members -const G4double TG3Units::fgLength = cm; -const G4double TG3Units::fgTime = s; -const G4double TG3Units::fgCharge = eplus; -const G4double TG3Units::fgEnergy = GeV; -const G4double TG3Units::fgMass = GeV; -const G4double TG3Units::fgMassDensity = g/cm3; -const G4double TG3Units::fgAtomicWeight = g/mole; -const G4double TG3Units::fgField = tesla; +const G4double TG3Units::fgkLength = cm; +const G4double TG3Units::fgkTime = s; +const G4double TG3Units::fgkCharge = eplus; +const G4double TG3Units::fgkEnergy = GeV; +const G4double TG3Units::fgkMass = GeV; +const G4double TG3Units::fgkMassDensity = g/cm3; +const G4double TG3Units::fgkAtomicWeight = g/mole; +const G4double TG3Units::fgkField = tesla; TG3Units::TG3Units() { // diff --git a/TGeant4/TG3Units.h b/TGeant4/TG3Units.h index 1d15e65c279..6c0f218134d 100644 --- a/TGeant4/TG3Units.h +++ b/TGeant4/TG3Units.h @@ -32,25 +32,25 @@ class TG3Units private: // static data members - static const G4double fgLength; //G3 length unit - static const G4double fgTime; //G3 time unit - static const G4double fgCharge; //G3 charge unit - static const G4double fgEnergy; //G3 energy unit - static const G4double fgMass; //G3 mass unit - static const G4double fgMassDensity; //G3 mass density unit - static const G4double fgAtomicWeight; //G3 atomic weight unit - static const G4double fgField; //G3 magnetic field unit + static const G4double fgkLength; //G3 length unit + static const G4double fgkTime; //G3 time unit + static const G4double fgkCharge; //G3 charge unit + static const G4double fgkEnergy; //G3 energy unit + static const G4double fgkMass; //G3 mass unit + static const G4double fgkMassDensity; //G3 mass density unit + static const G4double fgkAtomicWeight; //G3 atomic weight unit + static const G4double fgkField; //G3 magnetic field unit }; // inline methods -inline G4double TG3Units::Length() { return fgLength; } -inline G4double TG3Units::Time() { return fgTime; } -inline G4double TG3Units::Charge() { return fgCharge; } -inline G4double TG3Units::Energy() { return fgEnergy; } -inline G4double TG3Units::Mass() { return fgMass; } -inline G4double TG3Units::MassDensity() { return fgMassDensity; } -inline G4double TG3Units::AtomicWeight() { return fgAtomicWeight; } -inline G4double TG3Units::Field() { return fgField; } +inline G4double TG3Units::Length() { return fgkLength; } +inline G4double TG3Units::Time() { return fgkTime; } +inline G4double TG3Units::Charge() { return fgkCharge; } +inline G4double TG3Units::Energy() { return fgkEnergy; } +inline G4double TG3Units::Mass() { return fgkMass; } +inline G4double TG3Units::MassDensity() { return fgkMassDensity; } +inline G4double TG3Units::AtomicWeight() { return fgkAtomicWeight; } +inline G4double TG3Units::Field() { return fgkField; } #endif //TG3_UNITS_H diff --git a/TGeant4/TG4G3Defaults.cxx b/TGeant4/TG4G3Defaults.cxx index 6eb43eb94e4..98b37315547 100644 --- a/TGeant4/TG4G3Defaults.cxx +++ b/TGeant4/TG4G3Defaults.cxx @@ -11,33 +11,33 @@ // static const data members // precision tolerance -const G4double TG4G3Defaults::fgCutTolerance = 1. * keV; +const G4double TG4G3Defaults::fgkCutTolerance = 1. * keV; // kinetic energy cuts -const G4double TG4G3Defaults::fgCUTGAM = 0.001 * GeV; -const G4double TG4G3Defaults::fgCUTELE = 0.001 * GeV; -const G4double TG4G3Defaults::fgCUTNEU = 0.01 * GeV; -const G4double TG4G3Defaults::fgCUTHAD = 0.01 * GeV; -const G4double TG4G3Defaults::fgCUTMUO = 0.01 * GeV; -const G4double TG4G3Defaults::fgBCUTE = fgCUTGAM; -const G4double TG4G3Defaults::fgBCUTM = fgCUTGAM; -const G4double TG4G3Defaults::fgDCUTE = 10. * TeV; -const G4double TG4G3Defaults::fgDCUTM = 10. * TeV; -const G4double TG4G3Defaults::fgPPCUTM = 0.01 * GeV; +const G4double TG4G3Defaults::fgkCUTGAM = 0.001 * GeV; +const G4double TG4G3Defaults::fgkCUTELE = 0.001 * GeV; +const G4double TG4G3Defaults::fgkCUTNEU = 0.01 * GeV; +const G4double TG4G3Defaults::fgkCUTHAD = 0.01 * GeV; +const G4double TG4G3Defaults::fgkCUTMUO = 0.01 * GeV; +const G4double TG4G3Defaults::fgkBCUTE = fgkCUTGAM; +const G4double TG4G3Defaults::fgkBCUTM = fgkCUTGAM; +const G4double TG4G3Defaults::fgkDCUTE = 10. * TeV; +const G4double TG4G3Defaults::fgkDCUTM = 10. * TeV; +const G4double TG4G3Defaults::fgkPPCUTM = 0.01 * GeV; // physics processes -const TG3FlagValue TG4G3Defaults::fgPAIR = kActivate; // 1 -const TG3FlagValue TG4G3Defaults::fgCOMP = kActivate; // 1 -const TG3FlagValue TG4G3Defaults::fgPHOT = kActivate; // 1 -const TG3FlagValue TG4G3Defaults::fgPFIS = kInActivate; // 0 -const TG3FlagValue TG4G3Defaults::fgDRAY = kActivate2; // 2 -const TG3FlagValue TG4G3Defaults::fgANNI = kActivate; // 1 -const TG3FlagValue TG4G3Defaults::fgBREM = kActivate; // 1 -const TG3FlagValue TG4G3Defaults::fgHADR = kActivate; // 1 -const TG3FlagValue TG4G3Defaults::fgMUNU = kInActivate; // 0 -const TG3FlagValue TG4G3Defaults::fgDCAY = kActivate; // 1 -const TG3FlagValue TG4G3Defaults::fgLOSS = kActivate2; // 2 -const TG3FlagValue TG4G3Defaults::fgMULS = kActivate; // 1 +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 TG4G3Defaults::TG4G3Defaults() { // @@ -54,25 +54,25 @@ G4double TG4G3Defaults::CutValue(G4int g3Cut) switch (g3Cut) { case kCUTGAM: - return fgCUTGAM; break; + return fgkCUTGAM; break; case kCUTELE: - return fgCUTELE; break; + return fgkCUTELE; break; case kCUTNEU: - return fgCUTNEU; break; + return fgkCUTNEU; break; case kCUTHAD: - return fgCUTHAD; break; + return fgkCUTHAD; break; case kCUTMUO: - return fgCUTMUO; break; + return fgkCUTMUO; break; case kBCUTE: - return fgBCUTE; break; + return fgkBCUTE; break; case kBCUTM: - return fgBCUTM; break; + return fgkBCUTM; break; case kDCUTE: - return fgDCUTE; break; + return fgkDCUTE; break; case kDCUTM: - return fgDCUTM; break; + return fgkDCUTM; break; case kPPCUTM: - return fgPPCUTM; break; + return fgkPPCUTM; break; default: TG4Globals::Warning("TG4G3Defaults::CutValue: Inconsistent cut."); return 0.; @@ -86,29 +86,29 @@ TG3FlagValue TG4G3Defaults::FlagValue(G4int g3Flag) switch (g3Flag) { case kPAIR: - return fgPAIR; break; + return fgkPAIR; break; case kCOMP: - return fgCOMP; break; + return fgkCOMP; break; case kPHOT: - return fgPHOT; break; + return fgkPHOT; break; case kPFIS: - return fgPFIS; break; + return fgkPFIS; break; case kDRAY: - return fgDRAY; break; + return fgkDRAY; break; case kANNI: - return fgANNI; break; + return fgkANNI; break; case kBREM: - return fgBREM; break; + return fgkBREM; break; case kHADR: - return fgHADR; break; + return fgkHADR; break; case kMUNU: - return fgMUNU; break; + return fgkMUNU; break; case kDCAY: - return fgDCAY; break; + return fgkDCAY; break; case kLOSS: - return fgLOSS; break; + return fgkLOSS; break; case kMULS: - return fgMULS; break; + return fgkMULS; break; default: TG4Globals::Warning("TG4G3Defaults::FlagValue: Inconsistent flag."); return kUnset; @@ -120,7 +120,7 @@ G4bool TG4G3Defaults::IsDefaultCut(TG3Cut g3Cut, G4double value) // Tests if the parameter value is equal to the G3 default value. // --- - if (abs(value*GeV - CutValue(g3Cut)) > fgCutTolerance) + if (abs(value*GeV - CutValue(g3Cut)) > fgkCutTolerance) return false; else return true; diff --git a/TGeant4/TG4G3Defaults.h b/TGeant4/TG4G3Defaults.h index 2b8ecbe0f96..f446bb4e410 100644 --- a/TGeant4/TG4G3Defaults.h +++ b/TGeant4/TG4G3Defaults.h @@ -36,36 +36,36 @@ class TG4G3Defaults private: // static data members // precision tolerance - static const G4double fgCutTolerance; //tolerance for checking + static const G4double fgkCutTolerance; //tolerance for checking //cut values with default // kinetic energy cuts - static const G4double fgCUTGAM; //CUTGAM default value - static const G4double fgCUTELE; //CUTELE default value - static const G4double fgCUTNEU; //CUTNEU default value - static const G4double fgCUTHAD; //CUTHAD default value - static const G4double fgCUTMUO; //CUTMUO default value - static const G4double fgBCUTE; //BCUTE default value - static const G4double fgBCUTM; //BCUTM default value - static const G4double fgDCUTE; //DCUTE default value - static const G4double fgDCUTM; //DCUTM default value - static const G4double fgPPCUTM; //PPCUTM default value + static const G4double fgkCUTGAM; //CUTGAM default value + static const G4double fgkCUTELE; //CUTELE default value + static const G4double fgkCUTNEU; //CUTNEU default value + static const G4double fgkCUTHAD; //CUTHAD default value + static const G4double fgkCUTMUO; //CUTMUO default value + static const G4double fgkBCUTE; //BCUTE default value + static const G4double fgkBCUTM; //BCUTM default value + 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 fgPAIR; //PAIR default value - static const TG3FlagValue fgCOMP; //COMP default value - static const TG3FlagValue fgPHOT; //PHOT default value - static const TG3FlagValue fgPFIS; //PFIS default value - static const TG3FlagValue fgDRAY; //DRAY default value - static const TG3FlagValue fgANNI; //ANNI default value - static const TG3FlagValue fgBREM; //BREM default value - static const TG3FlagValue fgHADR; //HADR default value - static const TG3FlagValue fgMUNU; //MUNU default value - static const TG3FlagValue fgDCAY; //DCAY default value - static const TG3FlagValue fgLOSS; //LOSS default value - static const TG3FlagValue fgMULS; //MULS default value + 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 }; // inline methods -inline G4double TG4G3Defaults::CutTolerance() { return fgCutTolerance; } +inline G4double TG4G3Defaults::CutTolerance() { return fgkCutTolerance; } #endif //ALI_G3DEFAULTS_H -- 2.43.5