Changeset 1908

Timestamp:

04/04/03 21:15:24 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Simulation/Detector

Files:

• Data/axisdev2.dat (added)
• Data/magic2.def (added)
• ReflectorII/Changelog (modified) (1 diff)
• ReflectorII/geometry.c (modified) (4 diffs)
• ReflectorII/init.h (modified) (1 diff)
• ReflectorII/ph2cph.c (modified) (3 diffs)

trunk/MagicSoft/Simulation/Detector/ReflectorII/Changelog

@@ -1 +1 @@
 ** Add changes at the beginning! **
+
+4/04/2003 A. Moralejo
+
+init.h, geometry.c, ph2cph.c: 
+introduced variable ct_max_radius, the maximum distance in x or y from the 
+center to the edge of the telescope, measured on the parabolic dish. This
+is used in a fast check of whether the photon hits the disk in ph2cph.c
+
+ph2cph.c: 
+in function Lin2Curv(float x), changed the calculation of the curvilinear 
+coordinates (which before was only valid for ~17 m focus paraboloids).
 
 22/01/2003 A. Moralejo

trunk/MagicSoft/Simulation/Detector/ReflectorII/geometry.c

@@ -18 +18 @@
 int     ct_NPixels;             /*  number of pixels            */
 float   ct_PixelWidth;          /*  pixel width (cm)            */
+float   ct_max_radius;          /* Maximum value of curvilinear
+                                 * coordinates of the center of
+                                 * the mirrors.
+                                 */
 
 mirror *ct_data=NULL;           /*  ptr to mirror data          */
@@ -32 +36 @@
 static void ReadMirrorTable(FILE *geofile)
 {   int i;      /*  Mirror index        */
+
+    ct_max_radius = 0.;
 
     if ((ct_data=(mirror *)malloc(sizeof(mirror)*ct_NMirrors)) == NULL)
@@ -49 +55 @@
           break;
 
+        ct_max_radius = (ct_data[i].sx > ct_max_radius? ct_data[i].sx : 
+                         ct_max_radius);
+        ct_max_radius = (ct_data[i].sy > ct_max_radius? ct_data[i].sy : 
+                         ct_max_radius);
       }
+
     if (i < ct_NMirrors)
       FatalError(MIRR_FEW___FTL, i);
@@ -198 +209 @@
     fclose(geofile);
 
+    ct_max_radius += ct_RMirror;
+
     if (strlen(reflectivity_filename) == 0)
       strcpy(reflectivity_filename, REFLECTIVITY_FILE);

trunk/MagicSoft/Simulation/Detector/ReflectorII/init.h

@@ -59 +59 @@
 extern int   ct_NPixels;                /*  number of pixels            */
 extern float ct_PixelWidth;             /*  pixel width (cm)            */
-
+extern float ct_max_radius;             /* Approximate mirror dish radius, 
+                                         * used for fast rejection of photons 
+                                         * not hitting the dish (in ph2cph.c).
+                                         */
 
 typedef struct

trunk/MagicSoft/Simulation/Detector/ReflectorII/ph2cph.c

@@ -92 +92 @@
 
   float distmirr, distmirr2;  /* distances used in MAGIC reflection routine */
+
+
   float sx, sy;
   float t1, t2;
@@ -307 +309 @@
 
   /*  is it outside the dish? */ 
-          
-  if ((fabs(sx) > 850.0) || (fabs(sy) > 850.0)) {
+  if ((fabs(sx) > ct_max_radius) || (fabs(sy) > ct_max_radius)) {
     /* 
     cout << "CONDITION 1 !" << endl << flush;
@@ -848 +849 @@
 Lin2Curv(float x)
 {
+/*
   x /= 100.f;
   return ((x + 0.000144175317185f * x * x * x)*100.f);
+*/
+
+  double k = 0.25/ct_Focal_mean;
+  return ((2*k*x*sqrt(1+4*k*k*x*x)+asinh(2*k*x))/4/k);
 }