Changeset 4402 for trunk

Timestamp:

07/16/04 14:11:19 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/CalibLinkDef.h (modified) (2 diffs)
• mcalib/MCalibrationChargeCalc.cc (modified) (7 diffs)
• mcalib/MCalibrationChargeCalc.h (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -46 +46 @@
       camera
 
+  * mcalib/MCalibrationChargeCalc.[h,cc]
+    - adapted to use of various blind pixels
 
  2004/07/15: Markus Gaug

trunk/MagicSoft/Mars/mcalib/CalibLinkDef.h

@@ -20 +20 @@
 #pragma link C++ class MCalibrationChargeCam+;
 #pragma link C++ class MCalibrationChargePix+;
+#pragma link C++ class MCalibrationChargeBlindCam+;
 #pragma link C++ class MCalibrationChargeBlindPix+;
 #pragma link C++ class MCalibrationChargePINDiode+;
@@ -28 +29 @@
 #pragma link C++ class MHCalibrationChargeHiGainPix+;
 #pragma link C++ class MHCalibrationChargeLoGainPix+;
+#pragma link C++ class MHCalibrationChargeBlindCam+;
 #pragma link C++ class MHCalibrationChargeBlindPix+;
 #pragma link C++ class MHCalibrationChargePINDiode+;

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -207 +207 @@
 #include "MCalibrationChargePINDiode.h"
 #include "MCalibrationChargeBlindPix.h"
+#include "MCalibrationChargeBlindCam.h"
 
 #include "MExtractedSignalCam.h"
@@ -309 +310 @@
     fCam        = NULL;
     fBlindPixel = NULL;
+    fBlindCam   = NULL;
     fPINDiode   = NULL;
     fPedestals  = NULL;
@@ -433 +435 @@
   if (!fBlindPixel)
     {
+      fBlindCam = (MCalibrationChargeBlindCam*)pList->FindObject("MCalibrationChargeBlindCam");
+      if (!fBlindCam)
+        {
       *fLog << endl;
       *fLog << warn << GetDescriptor() 
-            << ": MCalibrationChargeBlindPix not found... no Blind Pixel method! " << endl;
+            << ": MCalibrationChargeBlindPix nor MCalibrationChargeBlindCam "
+            << " found... no Blind Pixel method! " << endl;
+        }
     }
   
@@ -456 +463 @@
       if (fBlindPixel)
         fBlindPixel->SetColor( fPulserColor );
+      
+      if (fBlindCam)
+        fBlindCam->SetColor( fPulserColor );
       
       if (fPINDiode)
@@ -477 +487 @@
         return kFALSE;
       }
+
+  if (fBlindCam)
+    if (fPulserColor != fBlindCam->GetColor())
+      {
+        *fLog << err << GetDescriptor() 
+              << ": Pulser colour has changed w.r.t. last file in MCalibrationChargeBlindCam." << endl;
+        *fLog << err << "This feature is not yet implemented, sorry ... aborting " << endl;
+        return kFALSE;
+      }
   
   if (fPINDiode)
@@ -577 +596 @@
               << ": MCalibrationChargeBlindPix is declared not valid... no Blind Pixel method! " << endl;
         fBlindPixel = NULL;
+      }
+
+  if (fBlindCam)
+    if (!fBlindCam->IsValid())
+      {
+        *fLog << warn << GetDescriptor() 
+              << ": MCalibrationChargeBlindCam is declared not valid... no Blind Pixel method! " << endl;
+        fBlindCam = NULL;
       }
   
@@ -694 +721 @@
   if (fBlindPixel)
     fBlindPixel->SetReadyToSave();
+  if (fBlindCam)
+    fBlindCam->SetReadyToSave();
   if (fPINDiode)
     fPINDiode->SetReadyToSave();

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.h

@@ -32 +32 @@
 class MPedestalPix;
 class MCalibrationChargePINDiode;
+class MCalibrationChargeBlindCam;
 class MCalibrationChargeBlindPix;
 class MCalibrationChargePix;
@@ -82 +83 @@
   MCalibrationChargeCam      *fCam;            //  Calibrated Charges of all pixels 
   MCalibrationChargeBlindPix *fBlindPixel;     //  Calibrated Charges of the Blind Pixel 
+  MCalibrationChargeBlindCam *fBlindCam;       //  Calibrated Charges of the Blind Pixels
   MCalibrationChargePINDiode *fPINDiode;       //  Calibrated Charges of the PIN Diode
   MCalibrationQECam          *fQECam;          //  Calibrated Quantum Efficiencies of all pixels