Index: trunk/MagicSoft/Mars/mcamera/MCameraTD.cc
===================================================================
--- trunk/MagicSoft/Mars/mcamera/MCameraTD.cc	(revision 7445)
+++ trunk/MagicSoft/Mars/mcamera/MCameraTD.cc	(revision 7446)
@@ -67,7 +67,7 @@
 // Return the discrimintaor delays
 //
-UShort_t MCameraTD::GetMin() const
+Byte_t MCameraTD::GetMin() const
 {
-    UShort_t val = (UShort_t)-1;
+    Byte_t val = 0xff;
     for (int i=0; i<fTD.GetSize(); i++)
         val = TMath::Min(val, fTD[i]);
@@ -79,7 +79,7 @@
 // Return the discrimintaor delays
 //
-UShort_t MCameraTD::GetMax() const
+Byte_t MCameraTD::GetMax() const
 {
-    UShort_t val = 0;
+    Byte_t val = 0;
     for (int i=0; i<fTD.GetSize(); i++)
         val = TMath::Max(val, fTD[i]);
Index: trunk/MagicSoft/Mars/mcamera/MCameraTD.h
===================================================================
--- trunk/MagicSoft/Mars/mcamera/MCameraTD.h	(revision 7445)
+++ trunk/MagicSoft/Mars/mcamera/MCameraTD.h	(revision 7446)
@@ -9,6 +9,6 @@
 #endif
 
-#ifndef ROOT_TArrayS
-#include <TArrayS.h>
+#ifndef ROOT_TArrayC
+#include <TArrayC.h>
 #endif
 
@@ -17,13 +17,13 @@
     friend class MReportCC;
 private:
-    TArrayS fTD; // [au] discriminator delays
+    TArrayC fTD; // [au] discriminator delays
 
 public:
     MCameraTD(Int_t size=577, const char *name=NULL, const char *title=NULL);
 
-    UShort_t operator[](Int_t i) { return (UShort_t)fTD[i]; }
+    Byte_t operator[](Int_t i) { return fTD[i]; }
 
-    UShort_t GetMin() const;
-    UShort_t GetMax() const;
+    Byte_t GetMin() const;
+    Byte_t GetMax() const;
 
     void Print(Option_t *opt=NULL) const;
Index: trunk/MagicSoft/Mars/mcamera/MCameraTH.cc
===================================================================
--- trunk/MagicSoft/Mars/mcamera/MCameraTH.cc	(revision 7445)
+++ trunk/MagicSoft/Mars/mcamera/MCameraTH.cc	(revision 7446)
@@ -67,7 +67,7 @@
 // Return the discriminator thresholds
 //
-UShort_t MCameraTH::GetMin() const
+Byte_t MCameraTH::GetMin() const
 {
-    UShort_t val = (UShort_t)-1;
+    Byte_t val = 0xff;
     for (int i=0; i<fTH.GetSize(); i++)
         val = TMath::Min(val, fTH[i]);
@@ -79,7 +79,7 @@
 // Return the discriminator thresholds
 //
-UShort_t MCameraTH::GetMax() const
+Byte_t MCameraTH::GetMax() const
 {
-    UShort_t val = 0;
+    Byte_t val = 0;
     for (int i=0; i<fTH.GetSize(); i++)
         val = TMath::Max(val, fTH[i]);
Index: trunk/MagicSoft/Mars/mcamera/MCameraTH.h
===================================================================
--- trunk/MagicSoft/Mars/mcamera/MCameraTH.h	(revision 7445)
+++ trunk/MagicSoft/Mars/mcamera/MCameraTH.h	(revision 7446)
@@ -9,6 +9,6 @@
 #endif
 
-#ifndef ROOT_TArrayS
-#include <TArrayS.h>
+#ifndef ROOT_TArrayC
+#include <TArrayC.h>
 #endif
 
@@ -17,13 +17,13 @@
     friend class MReportCC;
 private:
-    TArrayS fTH; // [au] discriminator thresholds
+    TArrayC fTH; // [au] discriminator thresholds
 
 public:
     MCameraTH(Int_t size=577, const char *name=NULL, const char *title=NULL);
 
-    UShort_t operator[](Int_t i) { return (UShort_t)fTH[i]; }
+    Byte_t operator[](Int_t i) { return fTH[i]; }
 
-    UShort_t GetMin() const;
-    UShort_t GetMax() const;
+    Byte_t GetMin() const;
+    Byte_t GetMax() const;
 
     void Print(Option_t *opt=NULL) const;
Index: trunk/MagicSoft/Mars/mreport/MReportCC.cc
===================================================================
--- trunk/MagicSoft/Mars/mreport/MReportCC.cc	(revision 7445)
+++ trunk/MagicSoft/Mars/mreport/MReportCC.cc	(revision 7446)
@@ -150,5 +150,5 @@
         pos += 2;
 
-        const Int_t n=sscanf(hex, "%2hx", &fTH->fTH[i++]);
+        const Int_t n=sscanf(hex, "%2hhx", &fTH->fTH[i++]);
         if (n==1)
             continue;