Changeset 8504 for trunk/MagicSoft/Mars/mcalib

Timestamp:

05/14/07 14:29:12 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• CalibLinkDef.h (modified) (1 diff)
• MCalibrationCam.cc (modified) (1 diff)
• Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

@@ -23 +23 @@
 #pragma link C++ class MCalibrationRelTimePix+;
 #pragma link C++ class MCalibrationPulseTimeCam+;
-#pragma link C++ class MCalibrationPedCam+;
 #pragma link C++ class MCalibrationQECamMagic+;
 #pragma link C++ class MCalibrationQECam+;

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -538 +538 @@
 // --------------------------------------------------------------------------
 //
-// Dummy needed for compilation with MCamEvent
-//
 Bool_t MCalibrationCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
 {
-  return kTRUE;
-}
-
-
+    if (idx > GetSize())
+        return kFALSE;
+
+    const Float_t area = cam[idx].GetA();
+
+    if (area == 0)
+        return kFALSE;
+
+    if ((*this)[idx].IsExcluded())
+        return kFALSE;
+
+    switch (type)
+    {
+    case 0:
+        val = (*this)[idx].GetHiGainMean();
+        break;
+    case 1:
+        val = (*this)[idx].GetHiGainMeanErr();
+        break;
+    case 2:
+        val = (*this)[idx].GetHiGainSigma();
+        break;
+    case 3:
+        val = (*this)[idx].GetHiGainSigmaErr();
+        break;
+    case 4:
+        val = (*this)[idx].GetHiGainProb();
+        break;
+    case 5:
+        val = (*this)[idx].GetLoGainMean();
+        break;
+    case 6:
+        val = (*this)[idx].GetLoGainMeanErr();
+        break;
+    case 7:
+        val = (*this)[idx].GetLoGainSigma();
+        break;
+    case 8:
+        val = (*this)[idx].GetLoGainSigmaErr();
+        break;
+    default:
+        return kFALSE;
+    }
+
+    return val!=-1.;
+}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mcalib/Makefile

@@ -48 +48 @@
            MCalibrationQECam.cc \
            MCalibrationQEPix.cc  \
-           MCalibrationPedCam.cc \
            MCalibrationTestCalc.cc \
            MCalibrationTestCam.cc \