Changeset 7445 for trunk

Timestamp:

12/06/05 16:08:41 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcamera

Files:

• MCameraTD.cc (modified) (2 diffs)
• MCameraTD.h (modified) (2 diffs)
• MCameraTH.cc (modified) (2 diffs)
• MCameraTH.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcamera/MCameraTD.cc

@@ -67 +67 @@
 // Return the discrimintaor delays
 //
-Byte_t MCameraTD::GetMin() const
+UShort_t MCameraTD::GetMin() const
 {
-    Byte_t val = 0xff;
+    UShort_t val = (UShort_t)-1;
     for (int i=0; i<fTD.GetSize(); i++)
         val = TMath::Min(val, fTD[i]);
@@ -79 +79 @@
 // Return the discrimintaor delays
 //
-Byte_t MCameraTD::GetMax() const
+UShort_t MCameraTD::GetMax() const
 {
-    Byte_t val = 0;
+    UShort_t val = 0;
     for (int i=0; i<fTD.GetSize(); i++)
         val = TMath::Max(val, fTD[i]);

trunk/MagicSoft/Mars/mcamera/MCameraTD.h

@@ -9 +9 @@
 #endif
 
-#ifndef ROOT_TArrayC
-#include <TArrayC.h>
+#ifndef ROOT_TArrayS
+#include <TArrayS.h>
 #endif
 
@@ -17 +17 @@
     friend class MReportCC;
 private:
-    TArrayC fTD; // [au] discriminator delays
+    TArrayS fTD; // [au] discriminator delays
 
 public:
     MCameraTD(Int_t size=577, const char *name=NULL, const char *title=NULL);
 
-    Byte_t operator[](Int_t i) { return fTD[i]; }
+    UShort_t operator[](Int_t i) { return (UShort_t)fTD[i]; }
 
-    Byte_t GetMin() const;
-    Byte_t GetMax() const;
+    UShort_t GetMin() const;
+    UShort_t GetMax() const;
 
     void Print(Option_t *opt=NULL) const;

trunk/MagicSoft/Mars/mcamera/MCameraTH.cc

@@ -67 +67 @@
 // Return the discriminator thresholds
 //
-Byte_t MCameraTH::GetMin() const
+UShort_t MCameraTH::GetMin() const
 {
-    Byte_t val = 0xff;
+    UShort_t val = (UShort_t)-1;
     for (int i=0; i<fTH.GetSize(); i++)
         val = TMath::Min(val, fTH[i]);
@@ -79 +79 @@
 // Return the discriminator thresholds
 //
-Byte_t MCameraTH::GetMax() const
+UShort_t MCameraTH::GetMax() const
 {
-    Byte_t val = 0;
+    UShort_t val = 0;
     for (int i=0; i<fTH.GetSize(); i++)
         val = TMath::Max(val, fTH[i]);

trunk/MagicSoft/Mars/mcamera/MCameraTH.h

@@ -9 +9 @@
 #endif
 
-#ifndef ROOT_TArrayC
-#include <TArrayC.h>
+#ifndef ROOT_TArrayS
+#include <TArrayS.h>
 #endif
 
@@ -17 +17 @@
     friend class MReportCC;
 private:
-    TArrayC fTH; // [au] discriminator thresholds
+    TArrayS fTH; // [au] discriminator thresholds
 
 public:
     MCameraTH(Int_t size=577, const char *name=NULL, const char *title=NULL);
 
-    Byte_t operator[](Int_t i) { return fTH[i]; }
+    UShort_t operator[](Int_t i) { return (UShort_t)fTH[i]; }
 
-    Byte_t GetMin() const;
-    Byte_t GetMax() const;
+    UShort_t GetMin() const;
+    UShort_t GetMax() const;
 
     void Print(Option_t *opt=NULL) const;