Merge remote-tracking branch 'origin/master' into mergingFlat

[u/mrichter/AliRoot.git] / TRD / AliTRDptrgCBB.h

diff --git a/TRD/AliTRDptrgCBB.h b/TRD/AliTRDptrgCBB.h
index c2c212e9aca4535faac6160c31f9523eb1ace25c..d71d797066e6b3170bef868988f4f7d6113dcd23 100644 (file)
--- a/TRD/AliTRDptrgCBB.h
+++ b/TRD/AliTRDptrgCBB.h
@@ -10,8 +10,9 @@
 // PTRG simulation
 //
 // --------------------------------------------------------
-#include "TObject.h"
 #include "AliTRDptrgParam.h"
+#include <TObjArray.h>
+#include <TObject.h>
 
 class AliRunLoader;
 
@@ -22,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
@@ -32,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