Changeset 3374 for trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

Timestamp:

03/01/04 17:18:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/manalysis/MMcCalibrationUpdate.cc

@@ -99 +99 @@
     }
 
-    return  run->GetRunType() == kRTMonteCarlo;
+    return run->IsMonteCarloRun();
 }
 
@@ -108 +108 @@
 Int_t MMcCalibrationUpdate::PreProcess(MParList *pList)
 {
-  fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
-  if ( !fCalCam )
-    {
-      *fLog << inf << dbginf << AddSerialNumber("MCalibrationChargeCam") << " does not exist... Creating." << endl;
-
-      fCalCam = (MCalibrationChargeCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationChargeCam"));
-      if ( !fCalCam )
-        {
-          *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MCalibrationChargeCam") << "... aborting." << endl;
-          return kFALSE;
-        }
-    }
-  else
-    {
-      fFillCalibrationCam = kFALSE;
-      *fLog << inf << AddSerialNumber("MCalibrationChargeCam") << " already exists... " << endl;
-    }
-
-  fPedPhotCam = (MPedPhotCam*) pList->FindCreateObj(AddSerialNumber("MPedPhotCam"));
-  if ( ! fPedPhotCam)
-    {
-      *fLog << err << dbginf << "Cannot create " << AddSerialNumber("MPedPhotCam") << "... aborting." << endl;
-      return kFALSE;
-    }
-
-  fSignalCam = (MExtractedSignalCam*) pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
-  if ( ! fSignalCam)
-    {
-      *fLog << err << dbginf << "Cannot find " << AddSerialNumber("MExtractedSignalCam") << "... aborting." << endl;
-      return kFALSE;
-    }
-
-  return kTRUE;
-
+    fCalCam = (MCalibrationChargeCam*) pList->FindObject(AddSerialNumber("MCalibrationChargeCam"));
+    if (!fCalCam)
+    {
+        fCalCam = (MCalibrationChargeCam*) pList->FindCreateObj(AddSerialNumber("MCalibrationChargeCam"));
+        if (!fCalCam)
+            return kFALSE;
+    }
+    else
+    {
+        fFillCalibrationCam = kFALSE;
+        *fLog << inf << AddSerialNumber("MCalibrationChargeCam") << " already exists... " << endl;
+    }
+
+    fPedPhotCam = (MPedPhotCam*) pList->FindCreateObj(AddSerialNumber("MPedPhotCam"));
+    if (!fPedPhotCam)
+        return kFALSE;
+
+    fSignalCam = (MExtractedSignalCam*) pList->FindObject(AddSerialNumber("MExtractedSignalCam"));
+    if (!fSignalCam)
+    {
+        *fLog << err << AddSerialNumber("MExtractedSignalCam") << " not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    return kTRUE;
 }
 
@@ -156 +147 @@
     //
     if (!CheckRunType(pList))
-      {
-        *fLog << inf << "This is no MC file... skipping." << endl;
+    {
+        *fLog << inf << "This is no MC file... skipping." << endl;
         return kTRUE;
-      }
+    }
         
     //
     // Now check the existence of all necessary containers.
     //
-
     fGeom = (MGeomCam*) pList->FindObject(AddSerialNumber("MGeomCam"));
-    if ( ! fGeom )
-      {
-        *fLog << err << dbginf << "Cannot find " << AddSerialNumber("MGeomCam") << "... aborting." << endl;
-        return kFALSE;
-      }
+    if (!fGeom)
+    {
+        *fLog << err << AddSerialNumber("MGeomCam") << " not found... aborting." << endl;
+        return kFALSE;
+    }
 
     fHeaderFadc = (MMcFadcHeader*)pList->FindObject(AddSerialNumber("MMcFadcHeader"));
     if (!fHeaderFadc)
     {
-      *fLog << err << dbginf << AddSerialNumber("MMcFadcHeader") << " not found... aborting." << endl;
+        *fLog << err << AddSerialNumber("MMcFadcHeader") << " not found... aborting." << endl;
         return kFALSE;
     }
@@ -182 +172 @@
     // Initialize Fadc simulation parameters:
     //
-    if ( fAmplitude < 0. )
-      {
+    if (fAmplitude < 0)
+    {
         fAmplitude = fHeaderFadc->GetAmplitud();
         fAmplitudeOuter = fHeaderFadc->GetAmplitudOuter();
         fConversionHiLo = fHeaderFadc->GetLow2HighGain();
-      }
+    }
     else   // Check that following files have all the same FADC parameters
-      {
-        if ( fabs(fHeaderFadc->GetAmplitud()-fAmplitude) > 1.e-6  ||
+    {
+        if ( fabs(fHeaderFadc->GetAmplitud()-fAmplitude)           > 1.e-6  ||
              fabs(fHeaderFadc->GetAmplitudOuter()-fAmplitudeOuter) > 1.e-6  ||
-             fabs(fConversionHiLo-fHeaderFadc->GetLow2HighGain()) > 1.e-6 )
+             fabs(fConversionHiLo-fHeaderFadc->GetLow2HighGain())  > 1.e-6 )
           {
-            *fLog << err << endl << endl << dbginf << "Parameters of MMcFadcHeader are not the same for all the read files. Aborting..." << endl << endl;
-            return kFALSE;
-          }
-      }
+              *fLog << err << "Parameters of MMcFadcHeader are not the same for all files... aborting." << endl;
+            return kFALSE;
+          }
+    }
 
     //
@@ -205 +195 @@
     // else has to be done in ReInit:
     //
-    if ( !fFillCalibrationCam )
-      return kTRUE;
+    if (!fFillCalibrationCam)
+        return kTRUE;
 
     //
@@ -278 +268 @@
         // counts for the RMS per slice:
         //
-
-        const Float_t pedestrms  = sigpix.IsLoGainUsed()? 
-          sqrt((Double_t)(fSignalCam->GetNumUsedLoGainFADCSlices())) * 
-          (fHeaderFadc->GetPedestalRmsLow(i)>0.? fHeaderFadc->GetPedestalRmsLow(i): 0.01)
-          : 
-          sqrt((Double_t)(fSignalCam->GetNumUsedHiGainFADCSlices())) * 
-          (fHeaderFadc->GetPedestalRmsHigh(i)>0.? fHeaderFadc->GetPedestalRmsHigh(i) : 0.01);
+        const Double_t used = (Double_t)(sigpix.IsLoGainUsed() ?
+                                         fSignalCam->GetNumUsedLoGainFADCSlices() :
+                                         fSignalCam->GetNumUsedHiGainFADCSlices());
+
+        const Float_t rms0 = sigpix.IsLoGainUsed() ?
+            fHeaderFadc->GetPedestalRmsLow(i) :
+            fHeaderFadc->GetPedestalRmsHigh(i);
+
+        const Float_t pedestrms = TMath::Sqrt(used) * (rms0>0 ? rms0 : 0.01);
 
         //
@@ -297 +289 @@
 
         if (sigpix.IsLoGainUsed())
-          pedpix.Set(adc2phot*hi2lo*pedestmean, 
-                     adc2phot*hi2lo*pedestrms);
+            pedpix.Set(adc2phot*hi2lo*pedestmean, adc2phot*hi2lo*pedestrms);
         else
-          pedpix.Set(adc2phot*pedestmean, adc2phot*pedestrms);
+            pedpix.Set(adc2phot*pedestmean, adc2phot*pedestrms);
 
     }