Corrected coding violations

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

diff --git a/STEER/AliTriggerDescriptor.cxx b/STEER/AliTriggerDescriptor.cxx
index 2db3c2bd86fefcf962b25c0cf644dff7e5e0fb5f..a9efa9c1009f5e43f966680f12400edf246685e2 100644 (file)
--- a/STEER/AliTriggerDescriptor.cxx
+++ b/STEER/AliTriggerDescriptor.cxx
@@ -62,6 +62,8 @@
 #include <TObjArray.h>
 #include <TSystem.h>
 #include <TKey.h>
+#include <TList.h>
+#include <TMap.h>
 #include <TFile.h>
 
 #include "AliLog.h"
@@ -69,6 +71,10 @@
 #include "AliRunLoader.h"
 #include "AliModule.h"
 
+#include "AliCDBManager.h"
+#include "AliCDBPath.h"
+#include "AliCDBEntry.h"
+
 #include "AliTriggerInput.h"
 #include "AliTriggerDetector.h"
 #include "AliTriggerCondition.h"
@@ -79,25 +85,31 @@ ClassImp(AliTriggerDescriptor)
 
 //_____________________________________________________________________________
 const char* AliTriggerDescriptor::fgkDetectorName[AliTriggerDescriptor::fgkNDetectors] =
-             { "ITS", "TRD", "PHOS", "EMCAL", "MUON", "ZDC", "START", "VZERO", "CRT" };
+             { "ITS", "TRD", "PHOS", "EMCAL", "MUON", "ZDC", "T0", "VZERO", "ACORDE", "TOF" };
 
 const TString AliTriggerDescriptor::fgkDescriptorFileName("/data/triggerDescriptors.root");
 
 //_____________________________________________________________________________
 AliTriggerDescriptor::AliTriggerDescriptor():
-TNamed(), fDetectorCluster("")
+  TNamed(),
+  fDetectorCluster(""),
+  fConditions()
 {
 }
 
 //_____________________________________________________________________________
 AliTriggerDescriptor::AliTriggerDescriptor( TString & name, TString & description ):
-TNamed( name, description ), fDetectorCluster("")
+  TNamed( name, description ),
+  fDetectorCluster(""),
+  fConditions()
 {
 }
 
 //_____________________________________________________________________________
 AliTriggerDescriptor::AliTriggerDescriptor( const AliTriggerDescriptor& des ):
-TNamed( des ), fDetectorCluster( des.fDetectorCluster )
+  TNamed( des ),
+  fDetectorCluster( des.fDetectorCluster ),
+  fConditions()
 {
    // Copy constructor
    Int_t ncond = des.fConditions.GetEntriesFast();
@@ -157,16 +169,14 @@ void AliTriggerDescriptor::AddCondition( TString & cond, TString & name, TString
    fConditions.AddLast( acond );
 }
 
-
 //_____________________________________________________________________________
 AliTriggerDescriptor* AliTriggerDescriptor::LoadDescriptor( TString & descriptor, const char* filename )
 {
    // Load one pre-created Descriptors from database/file that match
    // with the input string 'descriptor'
    // Ej: "Pb-Pb" or "p-p-DIMUON CALIBRATION-CENTRAL-BARREL"
-
    // Load the selected descriptor
-   TString path;
+  /*TString path;
    if( !filename[0] ) {
       path += gSystem->Getenv("ALICE_ROOT");
       path += fgkDescriptorFileName;
@@ -184,7 +194,23 @@ AliTriggerDescriptor* AliTriggerDescriptor::LoadDescriptor( TString & descriptor
 
    file.Close();
 
-   return des;
+   return des;*/
+  AliTriggerDescriptor *des = 0x0;
+  cout<<"GETTING TRIGGER DESCRIPTORS FROM CDB!!!"<<endl;
+ 
+  AliCDBPath path("GRP","CTP","Trigger");
+       
+  AliCDBEntry *entry=AliCDBManager::Instance()->Get(path.GetPath());
+  if(!entry) AliFatalClass("Couldn't load trigger description data from CDB!");
+
+  TList *list = (TList *) entry->GetObject();
+  for(Int_t i =  0; i < list->GetEntries(); i++) {
+    TMap *map = (TMap *)list->At(i);
+    des = (AliTriggerDescriptor *)map->GetValue(descriptor.Data());
+    if(des) return des;
+  }
+
+  return des;
 }
 
 //_____________________________________________________________________________