Changeset 348 for trunk/MagicSoft/Simulation/Detector/Reflector/reflector.cxx

Timestamp:

01/28/00 09:19:54 (25 years ago)

Author:

harald

Message:

A new version from JoseCarlosGonzalez. The old routine for random_pointing
was not correct. This one should be okay!!

File:

• trunk/MagicSoft/Simulation/Detector/Reflector/reflector.cxx (modified) (18 diffs)

trunk/MagicSoft/Simulation/Detector/Reflector/reflector.cxx

@@ -20 +20 @@
 //
 // $RCSfile: reflector.cxx,v $
-// $Revision: 1.8 $
+// $Revision: 1.9 $
 // $Author: harald $ 
-// $Date: 2000-01-28 08:59:49 $
+// $Date: 2000-01-28 09:19:54 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -795 +795 @@
 int Random_Pointing = FALSE;
 
+//@: number of times a shower is going to be processed
+int nRepeat_Random;
+
+//@: number of times a shower is already processed
+int nRepeated;
+
 //@: maximum random pointing distance
 float Random_Pointing_MaxDist; // [radians]
@@ -921 +927 @@
   parname[0] = '\0';
 
-  optarg = NULL;
+  optarg = 0;
   while ( !errflg && ((ch = getopt(argc, argv, COMMAND_LINE_OPTIONS)) != -1) )
     switch (ch) {
@@ -945 +951 @@
 
   if ( strlen(parname) < 1 )
-    readparam(NULL);
+    readparam(0);
   else
     readparam(parname);
@@ -1165 +1171 @@
     outputfile.write( SIGNATURE, sizeof(SIGNATURE) );
 
+  // get random pointing variables
+  
+  Random_Pointing = get_random_pointing( &Random_Pointing_MaxDist );
+
   // generate a sort of log information
 
   if ( verbose >= VERBOSE_MINIMAL ) {
+    log( SIGNATURE, "Random poi.:       %f\n", Random_Pointing_MaxDist );
     log( SIGNATURE, "Atmospheric model: %s\n", get_atm_mod() );
     log( SIGNATURE, "Number of paths:   %d\n", get_num_of_paths() );
@@ -1177 +1188 @@
 
   get_energy_cuts( &lE, &uE );
+
+  // get number of times which a shower is going to be used
+  // at different pointing directions
+  nRepeat_Random = get_repeat_random();   
 
   /*!@'
@@ -1202 +1217 @@
     directory = opendir(pathname);
 
-    if ( directory == NULL ) 
+    if ( directory == 0 ) 
       error( SIGNATURE, 
              "Cannot open directory %s\n", pathname );
@@ -1232 +1247 @@
         log(SIGNATURE, " * * * READING DATA FROM STDIN * * *\n");
 
-      get_stdin_files( 0, lE, uE, TRUE);
+      get_stdin_files(0, lE, uE, TRUE);
 
     }
@@ -1246 +1261 @@
     //            maximum number is not reached ) )
 
+    nRepeated = 0;
+
     while ( (
-             ((de = readdir( directory )) != NULL) &&
+             ((de = readdir( directory )) != 0) &&
              (num_cer_files < max_num_cer_files)
              )
@@ -1255 +1272 @@
              (num_cer_files < max_num_cer_files)
              ) ) {
-      
+        /*
+      // increment the number of times this files is used
+      nRepeated++;
+        */
+
       // if Block > 0, then we wait till a file __DOIT is present
       
@@ -1440 +1461 @@
         
       mcevth.put_times ( stat.get_tfirst(), stat.get_tlast() );
-
+        
       // get direction where the CT is pointing to
       // (or, better, from when the shower is coming from)
@@ -1451 +1472 @@
 
       // do we want random pointing (around shower axis) ?
-      if ( get_random_pointing( &Random_Pointing_MaxDist ) == TRUE ) {
+      if ( Random_Pointing == TRUE ) {
 
         // we do, then get a random position
@@ -1986 +2007 @@
         // the photon actually hit the mirror!!
 
+        
         t = t + ((( xm[2] > 0. ) ? -1.0 : +1.0) *
                  sqrt( SQR(xm[0] - xcut[0]) +
                        SQR(xm[1] - xcut[1]) +
                        SQR(xm[2] - xcut[2]) ) / Speed_of_Light_air_cmns);
-
-        // add path from the mirror till the camera
+                 
+        // add path from the mirror till the camera
 
         t = t + sqrt( SQR(xcutCT[0] - xcam[0]) +
@@ -2212 +2234 @@
 
   delete [] ct_Focal;        
-  ct_Focal = NULL;
+  ct_Focal = 0;
 
   // delete reflectivity table
@@ -2221 +2243 @@
   
   delete [] Reflectivity;    
-  Reflectivity = NULL;
+  Reflectivity = 0;
 
   // delete mirrors' data table
@@ -2230 +2252 @@
   
   delete [] ct_data;
-  ct_data = NULL;
+  ct_data = 0;
 }
 //!@}
@@ -3492 +3514 @@
 {
   float distance;
-  float it, ip,Nit;
+  float it, ip;
   float sin_theta, cos_theta;
   float sin_newtheta, cos_newtheta;
   float sin_iphi, cos_iphi;
   float iphi;
-  float range_aux;
-  int i;
-
-  //Random position of the CT. It is the distance
-  //between shower axis and CT position and its  
-  //distribution follows sin(it).
-
-  range_aux=1.0-sin(M_PI/2-range);
-  Nit = RandomNumber * range_aux;
+
+  // for the moment, we only simulate an uniform distribution,
+  // since our theta distribution in the generation of events is
+  // already uniform for hadrons, which are the main targets for
+  // using this option
+
+  it = RandomNumber * range;
   ip = RandomNumber * 2.0 * M_PI;
-  it = M_PI/2-asin((1.0-Nit));
-
-  sin_theta = sin(theta);
-  cos_theta = cos(theta);
-
-  cos_newtheta = cos_theta*cos(it) - sin_theta*sin(it)*cos(ip);
-  *newtheta = acos( cos_newtheta );
-  sin_newtheta = sin( *newtheta );
-  
-  if(theta!=0){
-    sin_iphi = sin(it)*sin(ip)/sin_newtheta;
-    cos_iphi = ((cos(it)-cos_newtheta*cos_theta)/(sin_newtheta*sin_theta));
+
+  if ( theta == 0.0 ) {
+
+    *newtheta = it;
+    *newphi = ip;
+
+  } else {
+    
+    sin_theta = sin(theta);
+    cos_theta = cos(theta);
+
+    cos_newtheta = cos_theta*cos(it) + sin_theta*sin(it)*cos(ip);
+    *newtheta = acos( cos_newtheta );
+    sin_newtheta = sin( *newtheta );
+    
+    sin_iphi = sin(it)*sin(ip) / sin_newtheta;
+    cos_iphi = (( cos(it) - cos_newtheta * cos_theta ) /
+                ( sin_newtheta * sin_theta ));
     
     iphi = atan2( sin_iphi, cos_iphi );
+    
+    *newphi = phi + iphi;
+
   }
-  else iphi=ip;
-
-  *newphi = phi + iphi;
 
   return( it );
@@ -3536 +3562 @@
 //!@{
 //
-// Revision 1.3  2000/01/03 12:41:26  harald
-// There was a small mistake with +/- signs in the prevois versions. This
-// line was founded by Jose Carlos. His remark is following:
-//
-// Look for the comment I include here in this block: you will see that
-// now the following expression has a +- sign, where before it was only
-// + (or -, I don't remember, but only one)
-//
-// Revision 1.2  1999/11/01 11:05:54  harald
-// Small changes to comile the reflector program under linux.
-// (Different use of NULL on DECalphas-osf1 and on linux)
-//
-// Revision 1.1.1.1  1999/10/29  07:00:33  harald
-// This is the startpoint for the futher development of the Reflector program
-// of Jose Carlos. For all developments use this CVS-controlled directory.
+// $Log: not supported by cvs2svn $
+// Revision 1.20  2000/01/27  10:47:54  gonzalez
+// JAN2000-STABLE
+//
+// Revision 1.19  1999/11/19  20:52:31  gonzalez
+// *** empty log message ***
 //
 // Revision 1.18  1999/10/05  11:11:12  gonzalez