Changeset 9380 for trunk

Timestamp:

03/03/09 13:32:58 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mgeom/MGeomCamSquare.cc (modified) (1 diff)
• mhist/MHCamera.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -49 +49 @@
    * mhist/Makefile:
      - removed accidental MHQuality
+
+   * mhist/MHCamera.cc:
+     - fixed a warning when calling DistancetoPrimitive
+
+   * mgeom/MGeomCamSquare.cc:
+     - accidentaly used Double_t instead of Short_t when calling
+       SetNeighbors
 
 

trunk/MagicSoft/Mars/mgeom/MGeomCamSquare.cc

@@ -94 +94 @@
             SetAt(idx, MGeomRectangle((0.5*nx-x)*diameter, (0.5*ny-y)*diameter, diameter));
 
-            const Double_t n0 = x==nx-1 ? -1. : idx+ny;
-            const Double_t n1 = x==0    ? -1. : idx-ny;
-            const Double_t n2 = y==ny-1 ? -1. : idx+1;
-            const Double_t n3 = y==0    ? -1. : idx-1;
+            const Short_t n0 = x==nx-1 ? -1. : idx+ny;
+            const Short_t n1 = x==0    ? -1. : idx-ny;
+            const Short_t n2 = y==ny-1 ? -1. : idx+1;
+            const Short_t n3 = y==0    ? -1. : idx-1;
 
-            Double_t n[4] = { n0, n1, n2, n3 };
+            Short_t n[4] = { n0, n1, n2, n3 };
 
             // Sort -1's to the end

trunk/MagicSoft/Mars/mhist/MHCamera.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.120 2009-03-02 14:32:50 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.121 2009-03-03 13:32:00 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -2028 +2028 @@
 
     for (Int_t i=0; i<fNcells-2; i++)
-        if ((*fGeomCam)[i].DistancetoPrimitive(px*conv, py*conv)<=0)
+        if ((*fGeomCam)[i].DistancetoPrimitive(TMath::Nint(px*conv), TMath::Nint(py*conv))<=0)
             return i;