Changeset 1513 for trunk/MagicSoft

Timestamp:

09/04/02 11:03:03 (22 years ago)

Author:

blanch

Message:

Modifications to use MGeomCam from MARS.

Location:

trunk/MagicSoft/Simulation/Detector/Camera

Files:

• camera.h (modified) (5 diffs)
• config.mk.Linux (modified) (2 diffs)

trunk/MagicSoft/Simulation/Detector/Camera/camera.h

@@ -19 +19 @@
 //=
 //= $RCSfile: camera.h,v $
-//= $Revision: 1.8 $
+//= $Revision: 1.9 $
 //= $Author: blanch $ 
-//= $Date: 2002-07-16 16:20:23 $
+//= $Date: 2002-09-04 09:59:07 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -271 +271 @@
 void read_pixels(struct camera *cam); 
 int pixels_are_neig(int pix1, int pix2);
-int bpoint_is_in_pix(double dx, double dy, int ipixnum, struct camera *pcam); 
+int bpoint_is_in_pix(double dx, double dy, int ipixnum, 
+                      MGeomCamMagic *pcamgeom); 
 float  dist_r_P(float a, float b, float c, 
                 float l, float m, float n,
@@ -278 +279 @@
 float lin_interpol(float x1, float y1, float x2, float y2, float x);
 int produce_phes( FILE *sp, // the input file
-                  struct camera *cam, // the camera layout
+                  MGeomCamMagic *camgeom, // the camera layout
                   float minwl_nm, // the minimum accepted wavelength
                   float maxwl_nm, // the maximum accepted wavelength
@@ -292 +293 @@
 
 int produce_nsbrates( char *inname,
-                      struct camera *cam,
+                      MGeomCamMagic *camgeom,
                       float nsbrate[][iNUMWAVEBANDS]
                       );
@@ -318 +319 @@
 /*
  *$Log: not supported by cvs2svn $
+ *Revision 1.8  2002/07/16 16:20:23  blanch
+ *Modifications done for the camera.cxx version, where a first implementation
+ *of the Star Field Rotation has been introduced.
+ *
  *Revision 1.7  2002/03/15 16:06:53  blanch
  *Library time.h has been added.

trunk/MagicSoft/Simulation/Detector/Camera/config.mk.Linux

@@ -18 +18 @@
 #---------------------------------------------------------------
 # $RCSfile: config.mk.Linux,v $
-# $Revision: 1.5 $
+# $Revision: 1.6 $
 # $Author: blanch $ 
-# $Date: 2001-04-20 07:57:07 $
+# $Date: 2002-09-04 10:03:03 $
 ##################################################################
 # @maintitle
@@ -50 +50 @@
 INCLUDE_EVITA_RAW    = ../../../include-Classes/MRawFormat
 INCLUDE_EVITA_BASE   = ../../../include-Classes/MBase
+INCLUDE_MARS_MGEOM   = ../../../include-Classes/mgeom
 INCLUDE_REFL         = ../ReflectorII
 INCLUDE_STAR         = ../StarResponse