Changeset 1747

Timestamp:

02/07/03 12:59:11 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mfileio/MCT1ReadPreProc.cc (modified) (1 diff)
• mgeom/MGeomCam.cc (modified) (1 diff)
• mgeom/MGeomCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
 
                                                          -*-*- 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 +20 @@
       - Added comments using the standard layout
       - some small changes following Thomas comments (memset, *fLog)    
+
 
 

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -431 +431 @@
     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
 }
 

trunk/MagicSoft/Mars/mgeom/MGeomCam.cc

@@ -115 +115 @@
 //  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;

trunk/MagicSoft/Mars/mgeom/MGeomCam.h

@@ -36 +36 @@
     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); }