Changeset 348 for trunk/MagicSoft/Simulation/Detector/Reflector/readparam.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/readparam.cxx (modified) (11 diffs)

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

@@ -19 +19 @@
 //=
 //= $RCSfile: readparam.cxx,v $
-//= $Revision: 1.1.1.1 $
+//= $Revision: 1.2 $
 //= $Author: harald $ 
-//= $Date: 1999-10-29 07:00:33 $
+//= $Date: 2000-01-28 09:19:54 $
 //=
 //=//////////////////////////////////////////////////////////////////////
@@ -120 +120 @@
 static int Data_To_STDOUT = FALSE;
 
+//@: number of times a shower is going to be processed
+static int nRepeat_Random = 1;
+
 //!@}
 
@@ -148 +151 @@
 // @desc  read parameters from the stdin / parameters file
 //
-// @var   *filename  Name of the parameters file (NULL->STDIN)
+// @var   *filename  Name of the parameters file (0->STDIN)
 //
 // @date Mon Sep 14 13:27:56 MET DST 1998
@@ -166 +169 @@
 
   // use cin or ifile (reading from STDIN or from parameters file?
-  if ( filename != NULL )
+  if ( filename != 0 )
     ifile.open( filename );
 
   // get signature
-  if ( filename != NULL )
+  if ( filename != 0 )
     ifile.getline(line, LINE_MAX_LENGTH);
   else
@@ -188 +191 @@
 
     // get line from file or stdin
-    if ( filename != NULL )
+    if ( filename != 0 )
       ifile.getline(line, LINE_MAX_LENGTH);
     else
@@ -233 +236 @@
       for (i=0; i<Num_of_paths; i++) {
 
-        if ( filename != NULL )
+        if ( filename != 0 )
           ifile.getline(Paths_list[i], PATH_MAX_LENGTH);
         else
@@ -358 +361 @@
       
       break;
-      
     
     case random_pointing:     // uses a random CT pointing for each shower
@@ -369 +371 @@
       cerr << "random_pointing: " << Random_Pointing_MaxDist << ' ';
       Random_Pointing_MaxDist = RAD(Random_Pointing_MaxDist);
-      cerr << Random_Pointing_MaxDist << " radians \n";
-
-      break;
-      
+      cerr << Random_Pointing_MaxDist << " radians \n" << flush;
+
+      break;
+      
+    case repeat_random:       // number of times a random pointing is to be done
+          
+      // set nRepeat_Random
+      sscanf(line, "%s %d", token, &nRepeat_Random);
+
+      cerr << "repeat_random: " << nRepeat_Random << '\n' << flush;
+
+      break;
     
     case block:               // analyzes data in blocks
@@ -410 +420 @@
   } // while (! is_end)
 
-  if ( filename != NULL ) {
+  if ( filename != 0 ) {
     ifile.close();
   }
@@ -821 +831 @@
 
 
+//!---------------------------------------------------------------------
+// @name get_repeat_random
+//       
+// @desc get number of times a random displacement is going to be done
+//
+// @return   number of times
+//
+// @date 
+//----------------------------------------------------------------------
+// @function
+
+//!@{ 
+int
+get_repeat_random(void)
+{
+  return ( nRepeat_Random );
+}
+//!@}
+
+
 //=------------------------------------------------------------
 //!@subsection Log of this file.
@@ -827 +857 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.14  2000/01/27  10:47:54  gonzalez
+// JAN2000-STABLE
+//
 // Revision 1.13  1999/10/05  11:06:38  gonzalez
 // Sep. 1999