Avoid conflict with global enum in Root6
authorhristov <Peter.Hristov@cern.ch>
Sat, 3 May 2014 19:14:35 +0000 (21:14 +0200)
committerhristov <Peter.Hristov@cern.ch>
Sat, 3 May 2014 19:14:35 +0000 (21:14 +0200)
TRD/AliTRDTriggerL0.cxx
TRD/AliTRDptrgCBAC.cxx
TRD/AliTRDptrgCBAC.h
TRD/AliTRDptrgCBB.cxx
TRD/AliTRDptrgCBB.h
TRD/AliTRDptrgFEB.cxx
TRD/AliTRDptrgFEB.h
TRD/AliTRDptrgParam.h
TRD/AliTRDptrgTLMU.cxx
TRD/AliTRDptrgTLMU.h

index bba3389..75860f8 100644 (file)
@@ -71,7 +71,7 @@ void AliTRDTriggerL0::Trigger()
 
   AliTRDptrgParam* param = AliTRDptrgParam::Instance();
 
-  AliTRDptrgCBB* ptrgCBB = new AliTRDptrgCBB(runLoader, param, kDigits);
+  AliTRDptrgCBB* ptrgCBB = new AliTRDptrgCBB(runLoader, param, AliTRDptrgParam::kDigits);
 
   Int_t* simulationResult;
   simulationResult = ptrgCBB->Simulate();
index e6f0f5a..be1d722 100644 (file)
@@ -44,8 +44,8 @@ AliTRDptrgCBAC::AliTRDptrgCBAC(AliRunLoader *rl)
   fRunLoader(rl),
   fLUTArray(),
   fFEBArray(),
-  fPosition(kUnknown),
-  fOperatingMode(kDigits),
+  fPosition(AliTRDptrgParam::kUnknown),
+  fOperatingMode(AliTRDptrgParam::kDigits),
   fParam(0x0)
 {
   //
@@ -58,8 +58,8 @@ AliTRDptrgCBAC::AliTRDptrgCBAC(AliRunLoader *rl)
 
 //______________________________________________________________________________
 AliTRDptrgCBAC::AliTRDptrgCBAC(AliRunLoader *rl, 
-                               AliTRDptrgFEBPosition_t position,
-                               AliTRDptrgOperatingMode_t operatingMode,
+                               AliTRDptrgParam::AliTRDptrgFEBPosition_t position,
+                               AliTRDptrgParam::AliTRDptrgOperatingMode_t operatingMode,
                                AliTRDptrgParam *param) 
   : TObject(),
   fRunLoader(rl),
@@ -76,28 +76,28 @@ AliTRDptrgCBAC::AliTRDptrgCBAC(AliRunLoader *rl,
   this->LoadParams(); // load parameters
  
   // T0
-  AliTRDptrgFEB *FEB = new AliTRDptrgFEB(this->fRunLoader, kTZERO, 
+  AliTRDptrgFEB *FEB = new AliTRDptrgFEB(this->fRunLoader, AliTRDptrgParam::kTZERO, 
                                          this->fOperatingMode, this->fPosition,
                                          0, this->fParam);
   this->fFEBArray.AddLast(FEB);
 
   // V0-1
-  FEB = new AliTRDptrgFEB(this->fRunLoader, kVZERO, this->fOperatingMode, 
+  FEB = new AliTRDptrgFEB(this->fRunLoader, AliTRDptrgParam::kVZERO, this->fOperatingMode, 
                           this->fPosition, 1, this->fParam);
   this->fFEBArray.AddLast(FEB);
 
   // V0-2
-  FEB = new AliTRDptrgFEB(this->fRunLoader, kVZERO, this->fOperatingMode, 
+  FEB = new AliTRDptrgFEB(this->fRunLoader, AliTRDptrgParam::kVZERO, this->fOperatingMode, 
                           this->fPosition, 2, this->fParam);
   this->fFEBArray.AddLast(FEB);
 
   // V0-3
-  FEB = new AliTRDptrgFEB(this->fRunLoader, kVZERO, this->fOperatingMode, 
+  FEB = new AliTRDptrgFEB(this->fRunLoader, AliTRDptrgParam::kVZERO, this->fOperatingMode, 
                           this->fPosition, 3, this->fParam);
   this->fFEBArray.AddLast(FEB);
 
   // V0-4
-  FEB = new AliTRDptrgFEB(this->fRunLoader, kVZERO, this->fOperatingMode, 
+  FEB = new AliTRDptrgFEB(this->fRunLoader, AliTRDptrgParam::kVZERO, this->fOperatingMode, 
                           this->fPosition, 4, this->fParam);
   this->fFEBArray.AddLast(FEB);
 
index 77d68f6..87dfaa4 100644 (file)
@@ -21,8 +21,8 @@ class AliRunLoader;
 class AliTRDptrgCBAC : public TObject {
  public:
   AliTRDptrgCBAC(AliRunLoader *rl = 0x0);
-  AliTRDptrgCBAC(AliRunLoader *rl, AliTRDptrgFEBPosition_t position,
-                 AliTRDptrgOperatingMode_t operatingMode, 
+  AliTRDptrgCBAC(AliRunLoader *rl, AliTRDptrgParam::AliTRDptrgFEBPosition_t position,
+                 AliTRDptrgParam::AliTRDptrgOperatingMode_t operatingMode, 
                  AliTRDptrgParam *param);
   ~AliTRDptrgCBAC();
   
@@ -34,8 +34,8 @@ class AliTRDptrgCBAC : public TObject {
   AliRunLoader *fRunLoader;  //!
   TObjArray fLUTArray; // Array with Look-Up-Tables
   TObjArray fFEBArray; // front end boxes connected to T0 (fFEB[0]) and VO (4x)
-  AliTRDptrgFEBPosition_t fPosition; // Control box position (A or C side)
-  AliTRDptrgOperatingMode_t fOperatingMode; // working on Digits or Hits?
+  AliTRDptrgParam::AliTRDptrgFEBPosition_t fPosition; // Control box position (A or C side)
+  AliTRDptrgParam::AliTRDptrgOperatingMode_t fOperatingMode; // working on Digits or Hits?
   AliTRDptrgParam* fParam; // parameters
  private:
   AliTRDptrgCBAC& operator=(const AliTRDptrgCBAC &rhs); // not implemented
index d4cd9a1..99b0572 100644 (file)
@@ -41,7 +41,7 @@ AliTRDptrgCBB::AliTRDptrgCBB(AliRunLoader *rl)
   : TObject(),
   fRunLoader(rl),
   fParam(0),
-  fOperatingMode(kDigits),
+  fOperatingMode(AliTRDptrgParam::kDigits),
   fCBA(0),
   fCBC(0),
   fTLMU(0),
@@ -54,7 +54,7 @@ AliTRDptrgCBB::AliTRDptrgCBB(AliRunLoader *rl)
 
 
 AliTRDptrgCBB::AliTRDptrgCBB(AliRunLoader *rl, AliTRDptrgParam* param, 
-                             AliTRDptrgOperatingMode_t operatingMode)
+                             AliTRDptrgParam::AliTRDptrgOperatingMode_t operatingMode)
   : TObject(),
   fRunLoader(rl),
   fParam(param),
@@ -66,8 +66,8 @@ AliTRDptrgCBB::AliTRDptrgCBB(AliRunLoader *rl, AliTRDptrgParam* param,
   fPTmasks(0x0) 
 {
   // recommended ctor
-  this->fCBA = new AliTRDptrgCBAC(rl, kA, operatingMode, param);
-  this->fCBC = new AliTRDptrgCBAC(rl, kC, operatingMode, param);
+  this->fCBA = new AliTRDptrgCBAC(rl, AliTRDptrgParam::kA, operatingMode, param);
+  this->fCBC = new AliTRDptrgCBAC(rl, AliTRDptrgParam::kC, operatingMode, param);
   this->fTLMU = new AliTRDptrgTLMU(rl, param, operatingMode);
 
   this->LoadParams();
index c477bef..bc018a5 100644 (file)
@@ -23,7 +23,7 @@ class AliTRDptrgCBB : public TObject {
  public:
   AliTRDptrgCBB(AliRunLoader *rl = 0x0);
   AliTRDptrgCBB(AliRunLoader *rl, AliTRDptrgParam* param, 
-                AliTRDptrgOperatingMode_t operatingMode);
+                AliTRDptrgParam::AliTRDptrgOperatingMode_t operatingMode);
   ~AliTRDptrgCBB();
   
   Int_t* Simulate(); // Simulates the ptrg behavior of event
@@ -33,7 +33,7 @@ class AliTRDptrgCBB : public TObject {
 
   AliRunLoader *fRunLoader;  //!
   AliTRDptrgParam *fParam; // singleton obj containing configuration parameters
-  AliTRDptrgOperatingMode_t fOperatingMode; // working on Digits or Hits?
+  AliTRDptrgParam:: AliTRDptrgOperatingMode_t fOperatingMode; // working on Digits or Hits?
 
   AliTRDptrgCBAC *fCBA; // control box at a side of the solenoid
   AliTRDptrgCBAC *fCBC; // control box at c side of the solenoid
index c83b432..b1254b1 100644 (file)
@@ -51,10 +51,10 @@ AliTRDptrgFEB::AliTRDptrgFEB(AliRunLoader *rl)
   fRunLoader(rl),
   fParam(0),
   fLUTArray(0),
-  fType(kUndefined),
-  fOperatingMode(kDigits),
+  fType(AliTRDptrgParam::kUndefined),
+  fOperatingMode(AliTRDptrgParam::kDigits),
   fInputChannelCount(0),
-  fPosition(kUnknown),  
+  fPosition(AliTRDptrgParam::kUnknown),  
   fID(0),
   fThreshold(0)
 {
@@ -63,9 +63,9 @@ AliTRDptrgFEB::AliTRDptrgFEB(AliRunLoader *rl)
 }
 
 //______________________________________________________________________________
-AliTRDptrgFEB::AliTRDptrgFEB(AliRunLoader *rl, AliTRDptrgFEBType_t febType, 
-                             AliTRDptrgOperatingMode_t operatingMode,
-                             AliTRDptrgFEBPosition_t position, Int_t id, 
+AliTRDptrgFEB::AliTRDptrgFEB(AliRunLoader *rl, AliTRDptrgParam::AliTRDptrgFEBType_t febType, 
+                             AliTRDptrgParam::AliTRDptrgOperatingMode_t operatingMode,
+                             AliTRDptrgParam::AliTRDptrgFEBPosition_t position, Int_t id, 
                              AliTRDptrgParam *param)
   : TObject(),
   fRunLoader(rl),
@@ -103,7 +103,7 @@ Int_t AliTRDptrgFEB::LoadDigits()
 {
   // loads T0 or V0 digits and discriminates them automatically
  
-  if (this->fType == kVZERO) {
+  if (this->fType == AliTRDptrgParam::kVZERO) {
     // load V0's digits --------------------------------------------------------
     // behavior adapted for AliVZERODigitizer.cxx 40613 2010-04-22 09:57:15Z   
  
@@ -149,7 +149,7 @@ Int_t AliTRDptrgFEB::LoadDigits()
 
       Int_t position = -1;
       if ((pmNumber >= 32) && (pmNumber <= 63)) { // V0-A (matched v40613)
-        position = 1; // kA
+        position = 1; // AliTRDptrgParam::kA
       } 
       else if ((pmNumber >= 0) && (pmNumber <= 31)) { // V0-C (matched v40613)
         position = 2; // kB
@@ -186,7 +186,7 @@ Int_t AliTRDptrgFEB::LoadDigits()
     loader->UnloadDigits();
     return inputVector;
   }
-  else if (this->fType == kTZERO) {
+  else if (this->fType == AliTRDptrgParam::kTZERO) {
     // load T0's digits --------------------------------------------------------
     AliLoader * fT0Loader = this->fRunLoader->GetLoader("T0Loader");
     //   AliT0digit *fDigits; 
@@ -228,10 +228,10 @@ Int_t AliTRDptrgFEB::LoadDigits()
     // A: 12 to 23
     // positions according to AliT0Digitizer.cxx Revision 37491
     Int_t nStart = 0;
-    if (this->fPosition == kC) { // C
+    if (this->fPosition == AliTRDptrgParam::kC) { // C
       nStart = 0;
     }
-    else if (this->fPosition == kA) { // A
+    else if (this->fPosition == AliTRDptrgParam::kA) { // A
       nStart = 12;
     }
 
@@ -264,10 +264,10 @@ Int_t AliTRDptrgFEB::LoadAndProcessHits()
   // loads TO or VO hits and converts them to digits optimized for ptrg  
   // afterwards the digits will be discriminated
   AliError("LoadAndProcessHits() - not yet implemented!\n");
-  if (this->fType == kVZERO) {         
+  if (this->fType == AliTRDptrgParam::kVZERO) {                
     return 0;
   }
-  else if (this->fType == kTZERO) {
+  else if (this->fType == AliTRDptrgParam::kTZERO) {
     return 0;
   }
   return -1;
@@ -280,7 +280,7 @@ Bool_t AliTRDptrgFEB::LoadParams()
 
   if (this->fParam == 0x0) {
     AliWarning("No paramater object specified - start loading defaults\n");
-    if (this->fType == kVZERO) {               
+    if (this->fType == AliTRDptrgParam::kVZERO) {              
       // initialize threshold
       this->fThreshold = new UInt_t[8]; 
       for (Int_t i = 0; i < 8; i++) {
@@ -344,7 +344,7 @@ Bool_t AliTRDptrgFEB::LoadParams()
   }
   else {
     // load parameters from object
-    if (this->fType == kVZERO) {               
+    if (this->fType == AliTRDptrgParam::kVZERO) {              
       // threshold
       this->fThreshold = 
         this->fParam->GetFEBV0Thresholds(this->fPosition, (this->fID - 1));
@@ -398,7 +398,7 @@ Int_t* AliTRDptrgFEB::Simulate()
   
   Int_t *result = new Int_t;
   (*result) = -1; 
-  if (this->fOperatingMode == kDigits) {
+  if (this->fOperatingMode == AliTRDptrgParam::kDigits) {
     Int_t inputVector = this->LoadDigits();
     delete result; // delete error return value
 
@@ -418,7 +418,7 @@ Int_t* AliTRDptrgFEB::Simulate()
       AliDebug(4, Form("FEB result[%d] = 0x%x",(iLUT + 1),result[iLUT + 1])); 
     }
   }
-  else if (this->fOperatingMode == kHits) {
+  else if (this->fOperatingMode == AliTRDptrgParam::kHits) {
     return result;
   }
   return result;
index 3816569..30e2110 100644 (file)
@@ -19,9 +19,9 @@ class AliRunLoader;
 class AliTRDptrgFEB : public TObject {
  public:
   AliTRDptrgFEB(AliRunLoader *rl = 0x0);
-  AliTRDptrgFEB(AliRunLoader *rl, AliTRDptrgFEBType_t febType, 
-                AliTRDptrgOperatingMode_t operatingMode, 
-                AliTRDptrgFEBPosition_t position, Int_t id,
+  AliTRDptrgFEB(AliRunLoader *rl, AliTRDptrgParam::AliTRDptrgFEBType_t febType, 
+                AliTRDptrgParam::AliTRDptrgOperatingMode_t operatingMode, 
+                AliTRDptrgParam::AliTRDptrgFEBPosition_t position, Int_t id,
                 AliTRDptrgParam *param);
 
   ~AliTRDptrgFEB();
@@ -37,10 +37,10 @@ protected:
   AliTRDptrgParam *fParam; // Configuration parameter object
   TObjArray fLUTArray; // Array with Look-Up-Tables
 
-  AliTRDptrgFEBType_t fType; // Indicates what input FEB uses (V0 or T0)
-  AliTRDptrgOperatingMode_t fOperatingMode; // working on Digits or Hits?
+  AliTRDptrgParam::AliTRDptrgFEBType_t fType; // Indicates what input FEB uses (V0 or T0)
+  AliTRDptrgParam::AliTRDptrgOperatingMode_t fOperatingMode; // working on Digits or Hits?
   Int_t fInputChannelCount; // Number of input channels 
-  AliTRDptrgFEBPosition_t fPosition; // 0 = unkown, 1 = A, 2 = C
+  AliTRDptrgParam::AliTRDptrgFEBPosition_t fPosition; // 0 = unkown, 1 = A, 2 = C
   Int_t fID; // 0 = T0, 1 = V0-1, 2 = V0-2, 3 = V0-3, 4 = V0-4 (numbering?)
   
   UInt_t *fThreshold; // specifies the threshold for incoming analog signals
index 0b6cf3f..70c6256 100644 (file)
@@ -15,6 +15,10 @@ class TArrayI;
 class TObjArray;
 #include "TObject.h"
 
+
+class AliTRDptrgParam : public TObject {
+ public:
   enum AliTRDptrgFEBType_t{ kUndefined = (Int_t)0, 
                             kTZERO = (Int_t)1, 
                             kVZERO = (Int_t)2 };
@@ -24,9 +28,6 @@ class TObjArray;
                                 kC = (Int_t)2,
                                 kUnknown = (Int_t)3 };
 
-
-class AliTRDptrgParam : public TObject {
- public:
   struct AliTRDptrgPTmasks {
     Bool_t fCBA[2]; // contribute CB-A look up results to pretrigger decision?
     Bool_t fCBC[2]; // contribute CB-C look up results to pretrigger decision?
index 799726e..0e9d81d 100644 (file)
@@ -47,7 +47,7 @@ AliTRDptrgTLMU::AliTRDptrgTLMU(AliRunLoader *rl)
   : TObject(),
   fRunLoader(rl),
   fParam(0x0),
-  fOperatingMode(kDigits),
+  fOperatingMode(AliTRDptrgParam::kDigits),
   fInputMask(0x0),
   fCMatrices(0x0),
   fMultiplicity(0x0),
@@ -64,7 +64,7 @@ AliTRDptrgTLMU::AliTRDptrgTLMU(AliRunLoader *rl)
 
 //______________________________________________________________________________
 AliTRDptrgTLMU::AliTRDptrgTLMU(AliRunLoader *rl,  AliTRDptrgParam *param,
-                               AliTRDptrgOperatingMode_t operatingMode)
+                               AliTRDptrgParam::AliTRDptrgOperatingMode_t operatingMode)
   : TObject(),
   fRunLoader(rl),
   fParam(param),
@@ -98,10 +98,10 @@ Int_t* AliTRDptrgTLMU::Simulate()
 {
   // starts a simulation
        
-  if (this->fOperatingMode == kDigits) {
+  if (this->fOperatingMode == AliTRDptrgParam::kDigits) {
     this->LoadDigits();
   }    
-  else if (this->fOperatingMode == kHits) {
+  else if (this->fOperatingMode == AliTRDptrgParam::kHits) {
     return 0x0; // TODO
   }
 
index 456d870..07bc035 100644 (file)
@@ -22,7 +22,7 @@ class AliTRDptrgTLMU : public TObject {
  public:
   AliTRDptrgTLMU(AliRunLoader *rl = 0x0);
   AliTRDptrgTLMU(AliRunLoader *rl,  AliTRDptrgParam *param, 
-                 AliTRDptrgOperatingMode_t operatingMode);
+                 AliTRDptrgParam::AliTRDptrgOperatingMode_t operatingMode);
   ~AliTRDptrgTLMU();
 
   Int_t* Simulate(); // starts a simulation
@@ -50,7 +50,7 @@ class AliTRDptrgTLMU : public TObject {
   // variables -----------------------------------------------------------------
   AliRunLoader *fRunLoader;  //!
   AliTRDptrgParam *fParam; // Configuration parameter object
-  AliTRDptrgOperatingMode_t fOperatingMode; // working on Digits or Hits?
+  AliTRDptrgParam::AliTRDptrgOperatingMode_t fOperatingMode; // working on Digits or Hits?
   
   const UInt_t* fInputMask; // input mask for TOF-bits (18x32=576)
   UInt_t fTOFinputBits[18]; // input bits from TOF (18x32)