Changeset 9490 for trunk/MagicSoft

Timestamp:

08/13/09 18:57:30 (15 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MArgs.cc (modified) (2 diffs)
• mbase/MLut.h (modified) (1 diff)
• mbase/MStatusArray.h (modified) (1 diff)
• msimreflector/MReflector.cc (modified) (1 diff)
• mtrigger/MTriggerPatternDecode.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2009/08/13 Thomas Bretz
+
+   * mbase/Margs.cc:
+     - fixed a problem returning 0 instead of "" for TString
+
+   * mbase/MLut.h, mbase/MStatusArray.h:
+     - added new overloads for Print to make it compile with newer root
+       versions without warning
+
+   * msimreflector/MReflector.cc:
+     - replaced ForEach to make it compile with newer root versions
+
+   * mtrigger/MTriggerPatternDecode.cc:
+     - removed some accidental debug output
+
+
 
  2009/08/13 Daniela Dorner

trunk/MagicSoft/Mars/mbase/MArgs.cc

@@ -182 +182 @@
         if (s->BeginsWith(name))
             return s->Data()+s->Index(name)+name.Length();
-    return 0;
+    return "";
 }
 
@@ -230 +230 @@
             return str;
         }
-    return 0;
+    return "";
 }
 

trunk/MagicSoft/Mars/mbase/MLut.h

@@ -56 +56 @@
     // TObject
     void Print(const Option_t *o="") const;
-    void Print(const Option_t *o, const Option_t *o2) const { Print(o); }
+    void Print(const Option_t *o, Option_t *) const         { Print(o); }
+    void Print(const Option_t *o, Int_t) const              { Print(o); }
+    void Print(const Option_t *o, const char*, Int_t) const { Print(o); }
+    void Print(const Option_t *o, TPRegexp&, Int_t) const   { Print(o); }
 
     ClassDef(MLut, 1) // A simple and fast easy-to-use look-up-table

trunk/MagicSoft/Mars/mbase/MStatusArray.h

@@ -39 +39 @@
 
     void Print(Option_t *o="") const;
-    void Print(const Option_t *o, Option_t *) const { Print(o); }
+    void Print(const Option_t *o, Option_t *) const         { Print(o); }
+    void Print(const Option_t *o, Int_t) const              { Print(o); }
+    void Print(const Option_t *o, const char*, Int_t) const { Print(o); }
+    void Print(const Option_t *o, TPRegexp&, Int_t) const   { Print(o); }
 
     TObject *FindObject(const char *object, const char *base) const;

trunk/MagicSoft/Mars/msimreflector/MReflector.cc

@@ -69 +69 @@
 void MReflector::SetSigmaPSF(Double_t psf)
 {
-    fMirrors.ForEach(MMirror, SetSigmaPSF)(psf);
+    fMirrors.R__FOR_EACH(MMirror, SetSigmaPSF)(psf);
 }
 

trunk/MagicSoft/Mars/mtrigger/MTriggerPatternDecode.cc

@@ -133 +133 @@
     fPattern->fUnprescaled = (pattern>>8) & 0xff;
 
-    cout << (int)((pattern>>6)&1) << " " << fPattern->fPrescaled << endl;
-
-    fPattern->Print();
-
     // This is a workaround for the new scheme in which L1TPU (the signal
     // comming directly from the L1 is connected, but the L1 (routed
@@ -150 +146 @@
     }
 
-    fPattern->Print();
-
     return kTRUE;
 }