ALIROOT-5643 Detector AD. The list of detectors was reordered an EMPTY detector

added with ID 20. The list of trigger inputs was extended to accomodate AD, MFT and FIT.

diff --git a/RAW/AliRawDB.cxx b/RAW/AliRawDB.cxx
index 8b490b130ace80c5f45963b00f139c4a86f8a868..9a8f023f6469c3546be7b48d6217ff83f64adc5e 100644 (file)
--- a/RAW/AliRawDB.cxx
+++ b/RAW/AliRawDB.cxx
@@ -76,10 +76,12 @@ Int_t AliRawDB::fgkDetBranches[AliDAQ::kNDetectors+1] = {
    1, /* 18 TRG */
    1, /* 19 EMCAL */
    1, /* 20 DAQ_TEST */
-   1, /* 21 MFT */
-   1, /* 22 FIT */
-   10, /* 23 HLT */
-   1 /* 24 --- */
+   1, /* 21 EMPTY */
+   1, /* 22 AD */
+   1, /* 23 MFT */
+   1, /* 24 FIT */
+   10,/* 25 HLT */
+   1  /* 26 --- */
 };
 
 //______________________________________________________________________________

diff --git a/STEER/ESD/AliTriggerInput.cxx b/STEER/ESD/AliTriggerInput.cxx
index 2552fd7801e6be782f5335f6d8bf1c2d702ba66f..94af696d3bad02fcc95b7575713093fffdb1e381 100644 (file)
--- a/STEER/ESD/AliTriggerInput.cxx
+++ b/STEER/ESD/AliTriggerInput.cxx
@@ -46,7 +46,7 @@ using std::endl;
 using std::cout;
 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};
+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,0,0,0,0};
 const char* AliTriggerInput::fgkCTPDetectorName[AliDAQ::kNDetectors] = {
   "SPD",
   "SDD",
@@ -68,6 +68,10 @@ const char* AliTriggerInput::fgkCTPDetectorName[AliDAQ::kNDetectors] = {
   "CTP",
   "EMCal",
   "DAQ_TEST",
+  "EMPTY",
+  "AD",
+  "MFT",
+  "FIT",
   "HLT"
 };
 

diff --git a/STEER/STEERBase/AliDAQ.cxx b/STEER/STEERBase/AliDAQ.cxx
index ca9ecf02f8ae269d4c9aed945ff9d7f4030143c6..dd3b09fb9bd45847114e602a79872d6584dd2e30 100644 (file)
--- a/STEER/STEERBase/AliDAQ.cxx
+++ b/STEER/STEERBase/AliDAQ.cxx
@@ -58,67 +58,73 @@ const char* AliDAQ::fgkDetectorName[AliDAQ::kNDetectors] = {
   "MUONTRG",
   "FMD",
   "T0",
-  "VZERO", // Name to be changed to V0 ?
+  "VZERO",
   "ZDC",
   "ACORDE",
   "TRG",
   "EMCAL",
   "DAQ_TEST",
+  "EMPTY",
+  "AD",
   "MFT",
-  "FIT",  //alla
+  "FIT",
   "HLT"
 };
 
 Int_t AliDAQ::fgkNumberOfDdls[AliDAQ::kNDetectors] = {
-  20,
-  24,
-  16,
-  216,
-  18,
-  72,
-  20,
-  20,
-  10,
-  6,
-  20,
-  2,
-  3,
-  1,
-  1,
-  1,
-  1,
-  1,
-  46,
-  1,
-  10,
-  1, // alla
-  28
+  20,   // ITSSPD
+  24,   // ITSSDD
+  16,   // ITSSSD
+  216,  // TPC
+  18,   // TRD
+  72,   // TOF
+  20,   // HMPID
+  20,   // PHOS
+  10,   // CPV
+  6,    // PMD
+  20,   // MUONTRK
+  2,    // MUONTRG
+  3,    // FMD
+  1,    // T0
+  1,    // VZERO
+  1,    // ZDC
+  1,    // ACORDE
+  1,    // TRG
+  46,   // EMCAL
+  1,    // DAQ_TEST
+  0,    // EMPTY
+  1,    // AD
+  10,   // MFT
+  1,    // FIT
+  28    // HLT
 };
 
 Float_t AliDAQ::fgkNumberOfLdcs[AliDAQ::kNDetectors] = {
-  4,
-  4,
-  4,
-  36,
-  3,
-  12,
-  4,
-  4,
-  2,
-  1,
-  5,
-  1,
-  1,
-  0.5,
-  0.5,
-  1,
-  1,
-  1,
-  8,
-  1,
-  1,
-  1,  //alla
-  7
+  4,    // ITSSPD
+  4,    // ITSSDD
+  4,    // ITSSSD
+  36,   // TPC
+  3,    // TRD
+  12,   // TOF
+  4,    // HMPID
+  4,    // PHOS
+  2,    // CPV
+  1,    // PMD
+  5,    // MUONTRK
+  1,    // MUONTRG
+  1,    // FMD
+  0.5,  // T0
+  0.5,  // VZERO
+  1,    // ZDC
+  1,    // ACORDE
+  1,    // TRG
+  8,    // EMCAL
+  1,    // DAQ_TEST
+  0,    // EMPTY
+  1,    // AD
+  1,    // MFT
+  1,    // FIT
+  7     // HLT
 };
 
 const char* AliDAQ::fgkOfflineModuleName[AliDAQ::kNDetectors] = {
@@ -142,8 +148,10 @@ const char* AliDAQ::fgkOfflineModuleName[AliDAQ::kNDetectors] = {
   "CTP",
   "EMCAL",
   "DAQ_TEST",
+  "EMPTY",
+  "AD",
   "MFT",
-  "FIT",  //alla
+  "FIT",
   "HLT"
 };
 
@@ -168,8 +176,10 @@ const char* AliDAQ::fgkOnlineName[AliDAQ::kNDetectors] = {
   "TRI",
   "EMC",
   "TST",
+  "EMP",
+  "AD0",
   "MFT",
-  "FIT",  //alla
+  "FIT",
   "HLT"
 };
 

diff --git a/STEER/STEERBase/AliDAQ.h b/STEER/STEERBase/AliDAQ.h
index 4698c37664d6e5d0cf50f950ff3d76e367751991..b65c93146e0c6d098c1f8be080b426392538f350 100644 (file)
--- a/STEER/STEERBase/AliDAQ.h
+++ b/STEER/STEERBase/AliDAQ.h
@@ -69,8 +69,7 @@ class AliDAQ: public TObject {
   static const char *OnlineName(Int_t detectorID);
 
   enum {
- //   kNDetectors = 22,    // Number of detectors
-    kNDetectors = 23,    // Number of detectors //alla
+    kNDetectors = 25,    // Number of detectors
     kHLTId = 30          // HLT detector index
   };
 
@@ -79,7 +78,7 @@ class AliDAQ: public TObject {
                     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, kMFT = 0x100000, kFIT = 0x200000, kHLT = 0x40000000};
+                    kDAQTEST = 0x80000, kEMPTY= 0x100000, kAD = 0x200000, kMFT = 0x400000, kFIT = 0x800000, kHLT = 0x40000000};
 
   enum DetectorBitsQualityFlag {kACORDE_QF   = 0x000001, kAD_QF       = 0x000002, kCPV_QF  = 0x000004, kDAQ_TEST_QF = 0x000008, 
                                kEMCAL_QF    = 0x000010, kFMD_QF      = 0x000020, kHLT_QF  = 0x000040, kHMPID_QF    = 0x000080, 
@@ -96,7 +95,7 @@ class AliDAQ: public TObject {
   static const char* fgkOfflineModuleName[kNDetectors]; // Names of the offline modules corresponding to the detectors
   static const char* fgkOnlineName[kNDetectors]; // Online (DAQ/ECS) detector names
 
-  ClassDef(AliDAQ, 4)   // ALICE DAQ Configuration class
+  ClassDef(AliDAQ, 5)   // ALICE DAQ Configuration class
 };
 
 #endif