Changeset 1550 for trunk/MagicSoft/Simulation/Detector

Timestamp:

10/18/02 17:53:03 (22 years ago)

Author:

blanch

Message:

Modification to read several reflector files.

File:

• trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx (modified) (5 diffs)

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

@@ -21 +21 @@
 //
 // $RCSfile: camera.cxx,v $
-// $Revision: 1.43 $
+// $Revision: 1.44 $
 // $Author: blanch $ 
-// $Date: 2002-09-13 10:53:39 $
+// $Date: 2002-10-18 16:53:03 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -1850 +1850 @@
                     heights,
                     corsika,
-                    (UInt_t)(REFL_VERSION*100),
+                    (UInt_t)(REFL_VERSION_A*100),
                     (UInt_t)(VERSION*100));
   
@@ -3033 +3033 @@
 int check_reflector_file(FILE *infile){
 
-  char Signature[20];           // auxiliary variable
   char sign[20];                // auxiliary variable
 
-  strcpy(Signature, REFL_SIGNATURE);
-  
-  strcpy(sign, Signature);
-  
-  fread( (char *)sign, strlen(Signature), 1, infile);
-
-  if (strcmp(sign, Signature) != 0) {
+  strcpy(sign, REFL_SIGNATURE_B);
+  
+  fread( (char *)sign, strlen(REFL_SIGNATURE_B), 1, infile);
+  if (strcmp(sign, REFL_SIGNATURE_A) == 0){
+    fread( (char *)sign, 1, 1, infile);
+    return 4;
+  }
+  else if (strcmp(sign, REFL_SIGNATURE_B) == 0){
+    fread( (char *)sign, 1, 1, infile);
+    return 5;
+  }
+  else if (strcmp(sign, REFL_SIGNATURE_C) == 0){
+    fread( (char *)sign, 1, 1, infile);
+    return 6;
+  }
+  else {
     cout << "ERROR: Signature of .rfl file is not correct\n";
     cout << '"' << sign << '"' << '\n';
-    cout << "should be: " << Signature << '\n';
+    cout << "should be: " << REFL_SIGNATURE_A <<" or "<< REFL_SIGNATURE_B <<" or " << REFL_SIGNATURE_C <<" or "<< '\n';
     return(FALSE);
   }
 
-  fread( (char *)sign, 1, 1, infile);
-
-  return(TRUE);
 
 }
@@ -3601 +3606 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.43  2002/09/13 10:53:39  blanch
+// Minor change to remove some undisired comments.
+//
 // Revision 1.42  2002/09/09 16:00:49  blanch
 // Statement has been included to avoid writting to disk MParContainer and MArray.
@@ -3731 +3739 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.43  2002/09/13 10:53:39  blanch
+// Minor change to remove some undisired comments.
+//
 // Revision 1.42  2002/09/09 16:00:49  blanch
 // Statement has been included to avoid writting to disk MParContainer and MArray.