New revision of the CTP configuration and simulation. For more details look in the...

[u/mrichter/AliRoot.git] / STEER / AliCentralTrigger.h

diff --git a/STEER/AliCentralTrigger.h b/STEER/AliCentralTrigger.h
index 12b0d6fe672fe20a1cb91546887bc1b5a326548b..dfd278ae3c9f62e7130806691fe774f24661c3b4 100644 (file)
--- a/STEER/AliCentralTrigger.h
+++ b/STEER/AliCentralTrigger.h
@@ -11,12 +11,12 @@
 // This class for running the Central Trigger Processor                      //
 //                                                                           //
 //                                                                           //
-//    Load Descriptors                                                       //
-//    Make a list the trigger detectors involve from the descriptors         //
+//    Load Configuration                                                     //
+//    Make a list the trigger detectors involved ( from the configuration)   //
 //    For the each event                                                     //
 //           Run the Trigger for the each detector                           //
 //           Get the inputs                                                  //
-//           Check the condition classes                                     //
+//           Check the trigger classes                                       //
 //           Create the class mask                                           //
 //           Save result                                                     //
 //                                                                           //
@@ -27,38 +27,38 @@
 
 class TTree;
 class AliRunLoader;
+class AliTriggerConfiguration;
 
 class AliCentralTrigger : public TObject {
 
 public:
                           AliCentralTrigger();
-                          AliCentralTrigger( TString & descriptor );
-                          AliCentralTrigger( const AliCentralTrigger& ctp );
+                          AliCentralTrigger( TString & config );
                virtual   ~AliCentralTrigger();
 
-                Bool_t    LoadDescriptor( TString & descriptor );
+                Bool_t    LoadConfiguration( TString & config );
                 Bool_t    RunTrigger( AliRunLoader * runloader );
-                ULong64_t CheckConditions();
+             ULong64_t    TriggerClasses();
                   void    Reset();
-                  void    DeleteDescriptors();
+                 void    DeleteConfiguration();
                   void    MakeBranch( TString name, TTree * tree );
   //  Getters
                TString    GetDetectors();
              ULong64_t    GetClassMask() const { return fClassMask; }
-               UChar_t    GetClusterMask();
-             TObjArray*   GetLoadedDescriptors() { return &fDescriptors; }
-             TObjArray*   GetResultConditions();
+              UChar_t    GetClusterMask() const { return fClusterMask; }
+ AliTriggerConfiguration* GetConfiguration() { return fConfiguration; }
+             TObjArray*   GetFiredClasses() const;
                   void    Print( const Option_t* opt ="" ) const;
 protected:
-       //        TString    fRunCondition;     // Running modes Ej. Pb-Pb, p-p, p-A
              ULong64_t    fClassMask;          // UID ( bitwise OR of conditions mask )
-             TObjArray    fDescriptors;        // Array of Trigger Descriptors (AliTriggerDescriptor)
-             TObjArray    fInputs;             //! Array of Trigger Inputs
+               UChar_t    fClusterMask;        // UID ( bitwise OR of clusters mask )
+ AliTriggerConfiguration* fConfiguration;      // Trigger Configuration used
 
 private:
                 Bool_t    IsSelected( TString detName, TString& detectors ) const;
+               AliCentralTrigger( const AliCentralTrigger& ctp );
 
-   ClassDef( AliCentralTrigger, 1 )  // class for running the Central Trigger Processor
+   ClassDef( AliCentralTrigger, 2 )  // class for running the Central Trigger Processor
 };