Changeset 4915 for trunk/MagicSoft

Timestamp:

09/10/04 09:50:55 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mbase/MArrayB.h (modified) (1 diff)
• mbase/MArrayD.h (modified) (1 diff)
• mhist/MHCamera.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2004/09/10: Thomas Bretz
+
+   * mhist/MHCamera.cc:
+     - removed some obsolete const_casts
+     - fixed an (un)signed comparison warning
+
+
+
  2004/09/09: Markus Gaug
  
@@ -106 +114 @@
      - removed some possible bugs in the case that no LoGain is 
        available at all.
+
+
 
  2004/09/09: Thomas Bretz

trunk/MagicSoft/Mars/mbase/MArrayB.h

@@ -168 +168 @@
         return fArray[i];
     }
+    const Byte_t &operator[](UInt_t i) const
+    {
+        return fArray[i];
+    }
 
     ClassDef(MArrayB, 1)  //Array of Byte_t

trunk/MagicSoft/Mars/mbase/MArrayD.h

@@ -151 +151 @@
         return fArray[i];
     }
+    const Double_t &operator[](UInt_t i) const
+    {
+        return fArray[i];
+    }
 
     ClassDef(MArrayD, 1)  //Array of Double_t

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1202 +1202 @@
     for (Int_t idx=0; idx<fNcells-2; idx++)
     {
-        Fill(idx, const_cast<TArrayD&>(event)[idx]); // FIXME: Slow!
-
-        if (!used || (*const_cast<TArrayC*>(used))[idx])
+        Fill(idx, event[idx]); // FIXME: Slow!
+
+        if (!used || (*used)[idx])
             SetUsed(idx);
     }
@@ -1216 +1216 @@
 void MHCamera::AddCamContent(const MArrayD &event, const TArrayC *used)
 {
-    if (event.GetSize()!=fNcells-2 || IsFreezed())
+    if (event.GetSize()!=(UInt_t)(fNcells-2) || IsFreezed())
         return;
 
@@ -1224 +1224 @@
     for (Int_t idx=0; idx<fNcells-2; idx++)
     {
-        Fill(idx, const_cast<MArrayD&>(event)[idx]); // FIXME: Slow!
-
-        if (!used || (*const_cast<TArrayC*>(used))[idx])
+        Fill(idx, event[idx]); // FIXME: Slow!
+
+        if (!used || (*used)[idx])
             SetUsed(idx);
     }