Reverting some changes since MFT is not yet built, there is no DAQ association, input...

diff --git a/STEER/ESD/AliTriggerInput.cxx b/STEER/ESD/AliTriggerInput.cxx
index 598e57f1094d3429d0f2c6cd74f098cd1a2be90d..6235ebdc83f11fc8d5fb13ac3477585a1fc0d4ed 100644 (file)
--- a/STEER/ESD/AliTriggerInput.cxx
+++ b/STEER/ESD/AliTriggerInput.cxx
@@ -44,12 +44,7 @@
 
 ClassImp( AliTriggerInput )
 
-Bool_t AliTriggerInput::fgkIsTriggerDetector[AliDAQ::kNDetectors] = {1,0,0,1,1,1,0,1,0,0,0,1,0,1,1,1,1,1,1,1,0
-// #ifdef MFT_UPGRADE
-//                                                                  ,0 
-// #endif
-                                                                    ,0     // AU
-};
+Bool_t AliTriggerInput::fgkIsTriggerDetector[AliDAQ::kNDetectors] = {1,0,0,1,1,1,0,1,0,0,0,1,0,1,1,1,1,1,1,1,0};
 const char* AliTriggerInput::fgkCTPDetectorName[AliDAQ::kNDetectors] = {
   "SPD",
   "SDD",
@@ -72,10 +67,6 @@ const char* AliTriggerInput::fgkCTPDetectorName[AliDAQ::kNDetectors] = {
   "EMCal",
   "DAQ_TEST",
   "HLT"
-//   #ifdef MFT_UPGRADE
-//   , "MFT"
-//   #endif    
-  , "MFT"    // AU
 };
 
 //_____________________________________________________________________________

diff --git a/STEER/STEERBase/AliDAQ.cxx b/STEER/STEERBase/AliDAQ.cxx
index 35acc84dbc310cd64cd9ad3035a9ba53653989e1..814fd226115704394bd63921eff3b8e26115f11c 100644 (file)
--- a/STEER/STEERBase/AliDAQ.cxx
+++ b/STEER/STEERBase/AliDAQ.cxx
@@ -63,9 +63,8 @@ const char* AliDAQ::fgkDetectorName[AliDAQ::kNDetectors] = {
   "ACORDE",
   "TRG",
   "EMCAL",
-  "DAQ_TEST"
-  , "MFT"   // AU
-  , "HLT"
+  "DAQ_TEST",
+  "HLT"
 };
 
 Int_t AliDAQ::fgkNumberOfDdls[AliDAQ::kNDetectors] = {
@@ -89,7 +88,6 @@ Int_t AliDAQ::fgkNumberOfDdls[AliDAQ::kNDetectors] = {
   1,
   46,
   1,
-  1,
   28
 };
 
@@ -114,7 +112,6 @@ Float_t AliDAQ::fgkNumberOfLdcs[AliDAQ::kNDetectors] = {
   1,
   8,
   1,
-  1,
   7
 };
 
@@ -138,10 +135,8 @@ const char* AliDAQ::fgkOfflineModuleName[AliDAQ::kNDetectors] = {
   "ACORDE",
   "CTP",
   "EMCAL",
-  ""
-  , "MFT"    // AU
-  ,  "HLT"
- 
+  "",
+  "HLT"
 };
 
 const char* AliDAQ::fgkOnlineName[AliDAQ::kNDetectors] = {
@@ -164,9 +159,8 @@ const char* AliDAQ::fgkOnlineName[AliDAQ::kNDetectors] = {
   "ACO",
   "TRI",
   "EMC",
-  "TST"
-  , "MFT"   // AU
-  , "HLT"
+  "TST",
+  "HLT"
 };
 
 AliDAQ::AliDAQ(const AliDAQ& source) :

diff --git a/STEER/STEERBase/AliDAQ.h b/STEER/STEERBase/AliDAQ.h
index 366854c8207b6a8ba52da1f270ff461d0072c3dc..dc85cc07e7ed8d93e2bda56bf607ad92511ee30c 100644 (file)
--- a/STEER/STEERBase/AliDAQ.h
+++ b/STEER/STEERBase/AliDAQ.h
@@ -69,29 +69,19 @@ class AliDAQ: public TObject {
   static const char *OnlineName(Int_t detectorID);
 
   enum {
-// #ifdef MFT_UPGRADE
-//     kNDetectors = 22,    // Number of detectors
-// #else
-//     kNDetectors = 21,    // Number of detectors
-// #endif
-    kNDetectors = 22,    // Number of detectors   // AU
+    kNDetectors = 21,    // Number of detectors
     kHLTId = 30          // HLT detector index
   };
-  
+
   enum DetectorBits {kSPD = 0x0001, kSDD = 0x0002, kSSD = 0x0004, kITS = 0x0007, 
                     kTPC = 0x0008, kTRD = 0x0010, kTOF = 0x0020, kHMPID = 0x0040, 
                     kPHOS = 0x0080, kCPV = 0x0100, kPMD = 0x0200, kMUONTRK = 0x0400,
                     kMUONTRG = 0x0800, kMUON = 0x0c00, kFMD = 0x1000, kT0 = 0x2000, kVZERO = 0x4000,
                     kZDC = 0x8000, kACORDE = 0x10000, kTRG = 0x20000, kEMCAL = 0x40000,
-                    kDAQTEST = 0x80000, kHLT = 0x40000000
-// #ifdef MFT_UPGRADE
-//                  ,kMFT = 0x80000000
-// #endif
-                    ,kMFT = 0x80000000     // AU
-  };
-  
-private:
-  
+                    kDAQTEST = 0x80000, kHLT = 0x40000000 };
+
+ private:
+
   static const char *fgkDetectorName[kNDetectors]; // Detector names
   static Int_t       fgkNumberOfDdls[kNDetectors]; // Number of DDLs per detector
   static Float_t     fgkNumberOfLdcs[kNDetectors]; // Number of LDCs per detector (not fixed - used only for the raw data simulation)

diff --git a/STEER/STEERBase/AliDetectorTag.h b/STEER/STEERBase/AliDetectorTag.h
index 403ce4cf129b01d2beccddac3dbde48f2fda0395..67dc5f3e5e70b253d79f97d0ac42e87fd7ddad78 100644 (file)
--- a/STEER/STEERBase/AliDetectorTag.h
+++ b/STEER/STEERBase/AliDetectorTag.h
@@ -60,10 +60,7 @@ class AliDetectorTag : public TObject {
   Bool_t GetVZERO()  const {return fMaskDAQ & AliDAQ::kVZERO;}
   Bool_t GetZDC()    const {return fMaskDAQ & AliDAQ::kZDC;}
   Bool_t GetEMCAL()  const {return fMaskDAQ & AliDAQ::kEMCAL;}
-//   #ifdef MFT_UPGRADE
-//   Bool_t GetMFT()    const {return fMaskDAQ & AliDAQ::kMFT;}
-//   #endif
-  Bool_t GetMFT()    const {return fMaskDAQ & AliDAQ::kMFT;}   // AU
+  
   //____________________________________________________//
  private:
   //  void Int2Bin();
@@ -84,11 +81,7 @@ class AliDetectorTag : public TObject {
   void SetVZERO()  {fMaskDAQ |= AliDAQ::kVZERO;}
   void SetZDC()    {fMaskDAQ |= AliDAQ::kZDC  ;}
   void SetEMCAL()  {fMaskDAQ |= AliDAQ::kEMCAL;}
-//   #ifdef MFT_UPGRADE
-//   void SetMFT()    {fMaskDAQ |= AliDAQ::kMFT;}
-//   #endif
-  void SetMFT()    {fMaskDAQ |= AliDAQ::kMFT;}   // AU
-       
+  
   //   TObjArray *fDetectorArray; //detectors' names - active
   UInt_t     fMaskDAQ;          //detector mask in DAQ
   UInt_t     fMaskReco;         //detector mask in Reco