added fPPRVersion attribute and its getter/setter

diff --git a/AliGeant4/AliDetSwitch.cxx b/AliGeant4/AliDetSwitch.cxx
index 22ee5519c56fc29dd839a21261c4a60c4852ba36..7525dac0539276e3d2aa9fa8192516b6ddf4aba6 100644 (file)
--- a/AliGeant4/AliDetSwitch.cxx
+++ b/AliGeant4/AliDetSwitch.cxx
@@ -7,11 +7,12 @@
 #include "AliGlobals.h"
 
 AliDetSwitch::AliDetSwitch(G4String detName, G4int nofVersions, 
-                 G4int defaultVersion, AliModuleType modType, 
-                G4bool isStandalone)
+                 G4int defaultVersion, G4int pprVersion,
+                AliModuleType modType, G4bool isStandalone)
   : fDetName(detName),
     fNofVersions(nofVersions),
     fDefaultVersion(defaultVersion),
+    fPPRVersion(pprVersion),
     fIsStandalone(isStandalone),
     fType(modType),
     fSwitchedVersion(-1)
@@ -24,6 +25,7 @@ AliDetSwitch::AliDetSwitch(const AliDetSwitch& right) {
   fDetName = right.fDetName;
   fNofVersions = right.fNofVersions;
   fDefaultVersion = right.fDefaultVersion;
+  fPPRVersion = right.fPPRVersion;
   fIsStandalone = right.fIsStandalone;
   fType = right.fType;
   fSwitchedVersion = right.fSwitchedVersion;
@@ -42,6 +44,7 @@ AliDetSwitch& AliDetSwitch::operator=(const AliDetSwitch& right)
   fDetName = right.fDetName;
   fNofVersions = right.fNofVersions;
   fDefaultVersion = right.fDefaultVersion;
+  fPPRVersion = right.fPPRVersion;
   fSwitchedVersion = right.fSwitchedVersion;
   fType = right.fType;
   fIsStandalone = right.fIsStandalone;
@@ -92,6 +95,14 @@ void AliDetSwitch::SwitchOnDefault()
   fSwitchedVersion = fDefaultVersion;
 }
 
+void AliDetSwitch::SwitchOnPPR()
+{
+// Switchs on the default version.
+// ---
+
+  fSwitchedVersion = fPPRVersion;
+}
+
 void AliDetSwitch::SwitchOff()
 {
 // No version is switched on.

diff --git a/AliGeant4/AliDetSwitch.h b/AliGeant4/AliDetSwitch.h
index 12a8b117e0ea7045c4396285c0918adeb24b090a..3275ca66d07c5da4024bc9dadce518991ec8e8ab 100644 (file)
--- a/AliGeant4/AliDetSwitch.h
+++ b/AliGeant4/AliDetSwitch.h
@@ -15,7 +15,8 @@ class AliDetSwitch
 {
   public:
     AliDetSwitch(G4String detName, G4int nofVersions, G4int defaultVersion,
-                 AliModuleType modType = kDetector, G4bool isStandalone = true);
+                 G4int pprVersion, AliModuleType modType = kDetector, 
+                G4bool isStandalone = true);
     AliDetSwitch(const AliDetSwitch& right);
     virtual ~AliDetSwitch();
 
@@ -27,12 +28,14 @@ class AliDetSwitch
     // methods
     void SwitchOn(G4int version); 
     void SwitchOnDefault(); 
+    void SwitchOnPPR(); 
     void SwitchOff(); 
 
     // get methods
     G4String GetDetName() const;
     G4int GetNofVersions() const;
     G4int GetDefaultVersion() const;
+    G4int GetPPRVersion() const;
     G4bool IsStandalone() const;
     AliModuleType GetType() const;
     G4int GetSwitchedVersion() const;
@@ -42,6 +45,7 @@ class AliDetSwitch
     G4String       fDetName;         //module name
     G4int          fNofVersions;     //number of versions
     G4int          fDefaultVersion;  //default version
+    G4int          fPPRVersion;      //default PPR version
     G4bool         fIsStandalone;    //true if module can be built standalone
     AliModuleType  fType;            //type of module (detector or structure)
     G4int          fSwitchedVersion; //current selected version
@@ -58,6 +62,9 @@ inline G4int AliDetSwitch::GetNofVersions() const
 inline G4int AliDetSwitch::GetDefaultVersion() const
 { return fDefaultVersion; }
 
+inline G4int AliDetSwitch::GetPPRVersion() const
+{ return fPPRVersion; }
+
 inline G4int AliDetSwitch::GetSwitchedVersion() const
 { return fSwitchedVersion; }