Changeset 1908 for trunk/MagicSoft/Simulation/Detector/ReflectorII/ph2cph.c

Timestamp:

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

Author:

moralejo

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Simulation/Detector/ReflectorII/ph2cph.c (modified) (3 diffs)

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);
 }