Changeset 3400 for trunk/MagicSoft/Mars/manalysis

Timestamp:

03/04/04 15:46:17 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -62 +62 @@
 
 #include "MRawRunHeader.h"
+#include "MMcRunHeader.hxx"
 #include "MMcFadcHeader.hxx"
 
@@ -169 +170 @@
     }
 
+    MMcRunHeader* mcrunh = (MMcRunHeader*) pList->FindObject("MMcRunHeader");
+
     //
     // Initialize Fadc simulation parameters:
@@ -175 +178 @@
     {
         fAmplitude = fHeaderFadc->GetAmplitud();
-        fAmplitudeOuter = fHeaderFadc->GetAmplitudOuter();
-        fConversionHiLo = fHeaderFadc->GetLow2HighGain();
+        if (mcrunh->GetCamVersion() > 60)
+          {
+            fAmplitudeOuter = fHeaderFadc->GetAmplitudOuter();
+            fConversionHiLo = fHeaderFadc->GetLow2HighGain();
+          }
+        else // old MC files, camera  < v0.7
+          {
+            fAmplitudeOuter = fAmplitude;
+            fConversionHiLo = 1;  // dummy value
+          }
+
     }
     else   // Check that following files have all the same FADC parameters
     {
-        if ( fabs(fHeaderFadc->GetAmplitud()-fAmplitude)           > 1.e-6  ||
-             fabs(fHeaderFadc->GetAmplitudOuter()-fAmplitudeOuter) > 1.e-6  ||
-             fabs(fConversionHiLo-fHeaderFadc->GetLow2HighGain())  > 1.e-6 )
-          {
-              *fLog << err << "Parameters of MMcFadcHeader are not the same for all files... aborting." << endl;
-            return kFALSE;
-          }
-    }
+      if ( fabs(fHeaderFadc->GetAmplitud()-fAmplitude) > 1.e-6 )
+        {
+          *fLog << err << "Parameters of MMcFadcHeader are not the same for all files... aborting." << endl;
+          return kFALSE;
+        }
+
+      if (mcrunh->GetCamVersion() > 60) // old MC files, camera < v0.7
+        {
+          if( fabs(fHeaderFadc->GetAmplitudOuter()-fAmplitudeOuter) > 1.e-6  ||
+              fabs(fConversionHiLo-fHeaderFadc->GetLow2HighGain())  > 1.e-6 )
+            {
+              *fLog << err << "Parameters of MMcFadcHeader are not the same for all files... aborting." << endl;
+              return kFALSE;
+            }
+        }
+    }
+
+
 
     //