- data member was shadowed (fTree)

[u/mrichter/AliRoot.git] / STEER / AliTriggerInput.cxx

diff --git a/STEER/AliTriggerInput.cxx b/STEER/AliTriggerInput.cxx
index 4370c5a6c11b9b4c2910c8034f999274de597439..efa5c75cb82519fb75d4834e8baeb2582799e015 100644 (file)
--- a/STEER/AliTriggerInput.cxx
+++ b/STEER/AliTriggerInput.cxx
@@ -44,7 +44,7 @@
 
 ClassImp( AliTriggerInput )
 
-Bool_t AliTriggerInput::fgkIsTriggerDetector[AliDAQ::kNDetectors] = {1,0,0,0,1,1,0,1,0,0,0,1,0,1,1,1,1,1,1,0};
+Bool_t AliTriggerInput::fgkIsTriggerDetector[AliDAQ::kNDetectors] = {1,0,0,0,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",
@@ -65,36 +65,14 @@ const char* AliTriggerInput::fgkCTPDetectorName[AliDAQ::kNDetectors] = {
   "ACORDE",
   "CTP",
   "EMCal",
-  "HLT"
-};
-
-const char* AliTriggerInput::fgkOfflineModuleName[AliDAQ::kNDetectors] = {
-  "ITS",
-  "ITS",
-  "ITS",
-  "TPC",
-  "TRD",
-  "TOF",
-  "HMPID",
-  "PHOS",
-  "CPV",
-  "PMD",
-  "MUON",
-  "MUON",
-  "FMD",
-  "T0",
-  "VZERO",
-  "ZDC",
-  "ACORDE",
-  "CTP",
-  "EMCAL",
+  "DAQ_TEST",
   "HLT"
 };
 
 //_____________________________________________________________________________
   AliTriggerInput::AliTriggerInput( TString name, TString det, UChar_t level, Int_t signature, Char_t number ):
     TNamed( name.Data(), det.Data() ),
-    fMask((number >= 0) ? 1 << number : 0 ),
+    fMask((number > 0) ? 1 << (number-1) : 0 ),
     fValue(0),
     fSignature(signature),
     fLevel(level),
@@ -132,7 +110,7 @@ void AliTriggerInput::Print( const Option_t* ) const
    cout << "Trigger Input:" << endl; 
    cout << "  Name:        " << GetName() << endl;
    cout << "  Detector:    " << GetTitle() << "(Id=" << (Int_t)fDetectorId << ")" << endl;
-   cout << "  Level:       " << fLevel << endl;
+   cout << "  Level:       " << (Int_t)fLevel << endl;
    cout << "  Signature:   " << fSignature << endl;
    cout << "  Number:      " << (Int_t)TMath::Log2(fMask) << endl;
    if (IsActive())
@@ -151,7 +129,7 @@ TString AliTriggerInput::GetModule() const
   // Get the detector module name (in AliRoot simulation sense)
   TString name = "";
   if (fDetectorId >= 0 && fDetectorId < AliDAQ::kNDetectors)
-    name = fgkOfflineModuleName[(Int_t)fDetectorId];
+    name = AliDAQ::OfflineModuleName((Int_t)fDetectorId);
   else
     AliError(Form("Invalid detector Id (%d)",(Int_t)fDetectorId));