Index: /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc
===================================================================
--- /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6950)
+++ /trunk/MagicSoft/Mars/mjobs/MJCalibrateSignal.cc	(revision 6951)
@@ -368,6 +368,8 @@
         interlacedcont.Add(&ibdcam);
         interlacedcont.Add(&hchacam);
-        interlacedcont.Add(&hbndcam);
-        interlacedcont.Add(&hpndiod);
+	if (IsUseBlindPixel())
+            interlacedcont.Add(&hbndcam);
+        if (IsUsePINDiode())  
+            interlacedcont.Add(&hpndiod);
         if (fIsRelTimesUpdate)
 	  interlacedcont.Add(&hrelcam);
@@ -599,8 +601,12 @@
     // Intensity Calibration histogramming
     //
-    MFillH filpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode",   "FillPINDiode");
-    MFillH filbnd("MHCalibrationChargeBlindCam", "MExtractedSignalBlindPixel", "FillBlindCam");
-    MFillH filcam("MHCalibrationChargeCam",      "MExtractedSignalCam",        "FillChargeCam");
-    MFillH filtme("MHCalibrationRelTimeCam",     "MArrivalTimeCam",            "FillRelTime");
+    MFillH filpin(&hpndiod, "MExtractedSignalPINDiode",   "FillPINDiode");
+    MFillH filbnd(&hbndcam, "MExtractedSignalBlindPixel", "FillBlindCam");
+    MFillH filcam(&hchacam, "MExtractedSignalCam",        "FillChargeCam");
+    MFillH filtme(&hrelcam, "MArrivalTimeCam",            "FillRelTime");
+//    MFillH filpin("MHCalibrationChargePINDiode", "MExtractedSignalPINDiode",   "FillPINDiode");
+//    MFillH filbnd("MHCalibrationChargeBlindCam", "MExtractedSignalBlindPixel", "FillBlindCam");
+//    MFillH filcam("MHCalibrationChargeCam",      "MExtractedSignalCam",        "FillChargeCam");
+//    MFillH filtme("MHCalibrationRelTimeCam",     "MArrivalTimeCam",            "FillRelTime");
     MFillH filhil("MHCalibrationHiLoCam",        "MExtractedSignalCam",        "FillHiLoRatio");
     MFillH filpul("MHCalibrationPulseTimeCam",   "MRawEvtData",                "FillPulseTime");
@@ -730,5 +736,4 @@
     tlist3.SetFilter(&fcalib);
 
-    MContinue contcal;
     if (fIsInterlaced)
     {
@@ -750,8 +755,7 @@
 	if (fIsRelTimesUpdate)
             tlist3.AddToList(&recalc);
-        tlist3.AddToList(&fill8);
-        tlist3.AddToList(&contcal);
     }  
 
+    // Continue for all non-cosmic events
     tlist2.AddToList(&conttp);
     if (extractor1)
@@ -778,4 +782,5 @@
     if (extractor2 || extractor1->InheritsFrom("MExtractTimeAndCharge"))
       tlist2.AddToList(&fill7);
+    tlist2.AddToList(&fill8);
     tlist2.AddToList(&fill9);