Adding partition name and format version.

diff --git a/STEER/AliTriggerConfiguration.cxx b/STEER/AliTriggerConfiguration.cxx
index a0cf8e4a7e57ce8a28942adb0957d6cfdc38d823..611d6d4ee4dc59abcaea560482a8ceec0492487a 100755 (executable)
--- a/STEER/AliTriggerConfiguration.cxx
+++ b/STEER/AliTriggerConfiguration.cxx
@@ -97,7 +97,8 @@ AliTriggerConfiguration::AliTriggerConfiguration():
   fMasks(),
   fDescriptors(),
   fClusters(),
-  fClasses()
+  fClasses(),
+  fVersion(0)
 {
   // Default constructor
 }
@@ -112,7 +113,8 @@ AliTriggerConfiguration::AliTriggerConfiguration( TString & name, TString & desc
   fMasks(),
   fDescriptors(),
   fClusters(),
-  fClasses()
+  fClasses(),
+  fVersion(0)
 {
   // Constructor
 }
@@ -508,6 +510,16 @@ Bool_t AliTriggerConfiguration::ProcessConfigurationLine(const char* line, Int_t
      TString strLine(line);
 
      if (strLine.BeginsWith("#")) return kTRUE;
+     if (strLine.BeginsWith("PARTITION:")) {
+       strLine.ReplaceAll("PARTITION:","");
+       SetName(strLine.Data());
+       return kTRUE;
+     }
+     if (strLine.BeginsWith("VERSION:")) {
+       strLine.ReplaceAll("VERSION:","");
+       fVersion = strLine.Atoi();
+       return kTRUE;
+     }
      if (strLine.BeginsWith("INPUTS:")) {
        level = 1;
        return kTRUE;
@@ -916,6 +928,7 @@ void AliTriggerConfiguration::Print( const Option_t*  ) const
    cout << "Trigger Configuration:"  << endl;
    cout << "  Name:              " << GetName() << endl; 
    cout << "  Description:       " << GetTitle() << endl;
+   cout << "  Version:           " << GetVersion() << endl;
    cout << "  Active Detectors:  " << GetActiveDetectors() << endl;
    cout << "  Trigger Detectors: " << GetTriggeringDetectors() << endl;
 

diff --git a/STEER/AliTriggerConfiguration.h b/STEER/AliTriggerConfiguration.h
index ceb7a887b5deddfcb8f7f496ab37f7b03a4bf3d5..c9673b7dde3ec2598fec172570623d3efc74d177 100755 (executable)
--- a/STEER/AliTriggerConfiguration.h
+++ b/STEER/AliTriggerConfiguration.h
@@ -85,6 +85,8 @@ public:
        const TObjArray&   GetDescriptors() const { return fDescriptors; }
        const TObjArray&   GetClasses() const { return fClasses; }
 
+                  Int_t   GetVersion() const { return fVersion; }
+
        //     AliTriggerCluster*   GetTriggerCluster(UInt_t index)
        //       { return (index < kNMaxClusters) ? (AliTriggerCluster*)fClusters[index] : NULL; }
 
@@ -120,13 +122,15 @@ private:
       TObjArray            fClusters;                         // Array of Detector Trigger Clusters
       TObjArray            fClasses;                          // Array of Trigger Classes
 
+      Int_t                fVersion;                          // Configuration format version
+
                  Bool_t    IsSelected( TString detName, TString & detectors ) const;
    static const TString    fgkConfigurationFileName;        //! name of default configurations file
 
    AliTriggerConfiguration&   operator=(const AliTriggerConfiguration& des);
    AliTriggerConfiguration( const AliTriggerConfiguration& des );
 
-   ClassDef( AliTriggerConfiguration, 1 )  // Define a trigger configuration
+   ClassDef( AliTriggerConfiguration, 2 )  // Define a trigger configuration
 };
 
 #endif