From 509b7052d1f509e7b49971bc48d19d9cba4dda48 Mon Sep 17 00:00:00 2001 From: cvetan Date: Tue, 20 May 2008 12:30:45 +0000 Subject: [PATCH] Adding partition name and format version. --- STEER/AliTriggerConfiguration.cxx | 17 +++++++++++++++-- STEER/AliTriggerConfiguration.h | 6 +++++- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/STEER/AliTriggerConfiguration.cxx b/STEER/AliTriggerConfiguration.cxx index a0cf8e4a7e5..611d6d4ee4d 100755 --- 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 ceb7a887b5d..c9673b7dde3 100755 --- 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 -- 2.43.5