Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 1746)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 1747)
@@ -1,7 +1,13 @@
 
                                                          -*-*- END -*-*-
+ 2003/02/06: Thomas Bretz
+
+    * mgeom/MGeomCam.[h,cc]:
+      - fixed a warning (GetPixRatio(int) --> GetPixRatio(Uint)
+
+
  2003/02/07: Antonio Stamerra 
 
-    * manalisys/MTrigLvl2.[cc|h]
+    * manalysis/MTrigLvl2.[cc|h]
       - added new function 
 	MTrigLvl2::GetLutCompactPixel(int cell, int lut, int neighpix=2) 
@@ -14,4 +20,5 @@
       - Added comments using the standard layout
       - some small changes following Thomas comments (memset, *fLog) 	
+
 
 
Index: /trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc	(revision 1746)
+++ /trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc	(revision 1747)
@@ -431,15 +431,12 @@
     fIn->read((Byte_t*)&outpars, sizeof(struct outputpars));
 
-<<<<<<< MCT1ReadPreProc.cc
-    return ProcessRunHeader(outpars);
-=======
     ProcessRunHeader(outpars);
 
     //rwagner: ReInit whenever new run commences
     // rc==-1 means: ReInit didn't work out
-    if (!fTaskList->ReInit(fParList)) return -1;
+    if (!fTaskList->ReInit(fParList))
+        return -1;
 
     return kTRUE;
->>>>>>> 1.13
 }
 
Index: /trunk/MagicSoft/Mars/mgeom/MGeomCam.cc
===================================================================
--- /trunk/MagicSoft/Mars/mgeom/MGeomCam.cc	(revision 1746)
+++ /trunk/MagicSoft/Mars/mgeom/MGeomCam.cc	(revision 1747)
@@ -115,5 +115,5 @@
 //  the id 0 to scale variables with the pixel size.
 //
-Float_t MGeomCam::GetPixRatio(Int_t i) const
+Float_t MGeomCam::GetPixRatio(UInt_t i) const
 {
     return i<fNumPixels ? (*this)[0].GetA()/(*this)[i].GetA() : 0;
Index: /trunk/MagicSoft/Mars/mgeom/MGeomCam.h
===================================================================
--- /trunk/MagicSoft/Mars/mgeom/MGeomCam.h	(revision 1746)
+++ /trunk/MagicSoft/Mars/mgeom/MGeomCam.h	(revision 1747)
@@ -36,5 +36,5 @@
     UInt_t  GetNumPixels() const       { return fNumPixels; }
     Float_t GetMaxRadius() const       { return fMaxRadius; }
-    Float_t GetPixRatio(Int_t i) const;
+    Float_t GetPixRatio(UInt_t i) const;
 
     MGeomPix &operator[](Int_t i)       { return *(MGeomPix*)fPixels->UncheckedAt(i); }