Bug fixes for type cast operator and schema rule. The change to the schema rule is...

diff --git a/HLT/BASE/AliHLTScalars.h b/HLT/BASE/AliHLTScalars.h
index a908d3a56577197fd34067d6bec954773e15794a..3452e0a7d3f3e91e430b55eb9ddbb4b416e79ed7 100644 (file)
--- a/HLT/BASE/AliHLTScalars.h
+++ b/HLT/BASE/AliHLTScalars.h
@@ -13,7 +13,6 @@
 
 #include "TObject.h"
 #include "TNamed.h"
-#include "TTimeStamp.h"
 #include "TClonesArray.h"
 #include "THashTable.h"
 
@@ -102,7 +101,7 @@ public:
                }
                
                /// Typecast operator for returning the value directly.
-               operator Double_t () { return fValue; }
+               operator Double_t () const { return fValue; }
                
        private:
                Double_t fValue; // The scalar's value.
@@ -224,7 +223,7 @@ public:
        /// Returns the named scalar or a zero sentinel if no such scalar is found.
        const AliScalar& operator [] (const TString& name) const { return GetScalar(name.Data()); }
 
-       /// Returns the named scalar for editing. A new scalar is created if n is out of range.
+       /// Returns the named scalar for editing. A new scalar is created if the named scalar is not found.
        AliScalar& operator [] (const TString& name) { return GetScalar(name.Data()); }
 
        /**

diff --git a/HLT/BASE/HLTbaseLinkDef.h b/HLT/BASE/HLTbaseLinkDef.h
index f128b1ca5a93527250fe99b546bc3c9dd75b6fc8..7328fe6944c9350b903fff276f30587f2575f6f1 100644 (file)
--- a/HLT/BASE/HLTbaseLinkDef.h
+++ b/HLT/BASE/HLTbaseLinkDef.h
@@ -112,7 +112,7 @@
 
 // Need to initialise the hash table which is transient after reading the class.
 #pragma read sourceClass="AliHLTScalars" version="[1-]" targetClass="AliHLTScalars"\
-  source="" target="fMap,fScalars" code="{fMap.AddAll(&fScalars);}"
+  source="" target="fMap" code="{fMap.AddAll(&newObj->fScalars);}"
 
 #pragma link C++ struct AliHLTComponentEventData+;
 #pragma link C++ struct AliHLTComponentBlockData+;