Changeset 3411 for trunk

Timestamp:

03/05/04 11:45:45 (22 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationChargeCalc.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -4 +4 @@
 
                                                  -*-*- END OF LINE -*-*-
+ 2004/03/05: Markus Gaug
+   * mcalib/MCalibraitonChargeCalc.cc
+     - remove some runheader line: 
+        if (runheader->IsMonteCarloRun())
+            return kTRUE;
+       which gave always true since this week, don't know why.
+
+
  2004/03/04: Sebastian Raducci
   

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -168 +168 @@
     }
 
-    const MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-    if (!runheader)
-      *fLog << warn << "Warning - cannot check file type, MRawRunHeader not found." << endl;
-    else
-      if (runheader->IsMonteCarloRun())
-          return kTRUE;
-    
     fCam = (MCalibrationChargeCam*)pList->FindCreateObj("MCalibrationChargeCam");
     if (!fCam)
@@ -218 +211 @@
 Bool_t MCalibrationChargeCalc::ReInit(MParList *pList )
 {
-    fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
-    if (!fRunHeader)
+
+  fRunHeader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
+  if (!fRunHeader)
     {
       *fLog << err << "MRawRunHeader not found... aborting." << endl;
@@ -225 +219 @@
     }
 
-    fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
-    if (!fGeom)
-    {
-        *fLog << err << "No MGeomCam found... aborting." << endl;
-        return kFALSE;
-    }
-
-    fCam->SetGeomCam(fGeom);
-
-    fNumHiGainSamples =  fSignals->GetNumUsedHiGainFADCSlices();
-    fNumLoGainSamples =  fSignals->GetNumUsedLoGainFADCSlices();
-    fSqrtHiGainSamples = TMath::Sqrt((Float_t)fNumHiGainSamples);
-
-    UInt_t npixels = fGeom->GetNumPixels();
-
-    for (UInt_t i=0; i<npixels; i++)
-    {
-        MCalibrationChargePix &pix = (*fCam)[i];
-        pix.DefinePixId(i);
-
-        pix.SetAbsTimeBordersHiGain(fSignals->GetFirstUsedSliceHiGain(),
-                                    fSignals->GetLastUsedSliceHiGain());
-        pix.SetAbsTimeBordersLoGain(fSignals->GetFirstUsedSliceLoGain(),
-                                    fSignals->GetLastUsedSliceLoGain());
-    }
-    
-    if (fExcludedPixelsFile.IsNull())
+  fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
+  if (!fGeom)
+    {
+      *fLog << err << "No MGeomCam found... aborting." << endl;
+      return kFALSE;
+    }
+  
+  fCam->SetGeomCam(fGeom);
+
+  fNumHiGainSamples =  fSignals->GetNumUsedHiGainFADCSlices();
+  fNumLoGainSamples =  fSignals->GetNumUsedLoGainFADCSlices();
+  fSqrtHiGainSamples = TMath::Sqrt((Float_t)fNumHiGainSamples);
+  
+  UInt_t npixels = fGeom->GetNumPixels();
+  
+  for (UInt_t i=0; i<npixels; i++)
+    {
+      MCalibrationChargePix &pix = (*fCam)[i];
+      pix.DefinePixId(i);
+      
+      pix.SetAbsTimeBordersHiGain(fSignals->GetFirstUsedSliceHiGain(),
+                                  fSignals->GetLastUsedSliceHiGain());
+      pix.SetAbsTimeBordersLoGain(fSignals->GetFirstUsedSliceLoGain(),
+                                  fSignals->GetLastUsedSliceLoGain());
+    }
+  
+  if (fExcludedPixelsFile.IsNull())
         return kTRUE;