Add class for intersection of a user and a default configuration

diff --git a/PWG/CMakelibPWGEMCAL.pkg b/PWG/CMakelibPWGEMCAL.pkg
index c32868eb1beae2a6d7701b24fe6ead50213ad56c..1c3b59422ac1c9b844930c25f3a5f995ba88da74 100644 (file)
--- a/PWG/CMakelibPWGEMCAL.pkg
+++ b/PWG/CMakelibPWGEMCAL.pkg
@@ -62,6 +62,7 @@ set ( SRCS
  EMCAL/AliEMCALConfigurationObject.cxx
  EMCAL/AliEMCALConfiguration.cxx
  EMCAL/AliEMCALConfigHandler.cxx
+ EMCAL/AliEMCALConfigurationMatcher.cxx
 )
 
 string ( REPLACE ".cxx" ".h" HDRS "${SRCS}" )

diff --git a/PWG/EMCAL/AliEMCALConfiguration.cxx b/PWG/EMCAL/AliEMCALConfiguration.cxx
index cc765626610a0e0cc17646db30c0ea9707b08cac..d677480abcc4c590d4f43322e547d13d6d892889 100644 (file)
--- a/PWG/EMCAL/AliEMCALConfiguration.cxx
+++ b/PWG/EMCAL/AliEMCALConfiguration.cxx
@@ -69,7 +69,7 @@ void AliEMCALConfiguration::AddConfiguration(AliEMCALConfiguration* conf) {
   fParams->Add(conf);
 }
 
-AliEMCALConfigurationValue* AliEMCALConfiguration::GetValue(const char *key) {
+AliEMCALConfigurationValue* AliEMCALConfiguration::GetValue(const char *key) const {
   AliEMCALConfigurationObject *val = dynamic_cast<AliEMCALConfigurationObject *>(fParams->FindObject(key));
   if(!val) return NULL;
   return val->GetValue();

diff --git a/PWG/EMCAL/AliEMCALConfiguration.h b/PWG/EMCAL/AliEMCALConfiguration.h
index 38b61ca00560a12343f0be7ad342a07bf24c92df..de3ca35bea92b0cb935edd7610cd3615421971b8 100644 (file)
--- a/PWG/EMCAL/AliEMCALConfiguration.h
+++ b/PWG/EMCAL/AliEMCALConfiguration.h
@@ -13,6 +13,8 @@
 
 class TList;
 
+class AliEMCALConfigurationValue;
+
 class AliEMCALConfiguration : public TNamed {
 public:
   AliEMCALConfiguration(const char *name);
@@ -24,7 +26,8 @@ public:
   void Build(TList *entries);
   const char *CreateJSONString() const;
 
-  AliEMCALConfigurationValue *GetValue(const char *key);
+  Bool_t HasKey(const char *key) const { return GetValue(key) != NULL; }
+  AliEMCALConfigurationValue *GetValue(const char *key) const ;
   void Print(Option_t *) const;
 
 protected:

diff --git a/PWG/PWGEMCALLinkDef.h b/PWG/PWGEMCALLinkDef.h
index ad5e6c3a4eb292f9364933bbe3703cff0b661f40..41473ba89cd20d2f9dcd464730f6299f4fedcd7b 100644 (file)
--- a/PWG/PWGEMCALLinkDef.h
+++ b/PWG/PWGEMCALLinkDef.h
@@ -45,6 +45,7 @@
 #pragma link C++ class AliEMCALConfigurationValueDouble+;
 #pragma link C++ class AliEMCALConfigurationValueBool+;
 #pragma link C++ class AliEMCALConfigurationValueString+;
+#pragma link C++ class AliEMCALConfigurationMatcher+;
 
 #endif