Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2852)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2853)
@@ -30,4 +30,8 @@
 
   * mcalib/MCalibrationCalc.[h,cc]
+    - Modified way to change the fit function
+    - incorporate option to exclude pixels from configuration file
+
+  * macros/calibration.C
     - Modified way to change the fit function
     - incorporate option to exclude pixels from configuration file
Index: trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- trunk/MagicSoft/Mars/macros/calibration.C	(revision 2852)
+++ trunk/MagicSoft/Mars/macros/calibration.C	(revision 2853)
@@ -89,8 +89,12 @@
     plist2.AddToList(&tlist2);
 
+    MExtractedSignalCam   sigcam;
+    MCalibrationCam       calcam;
     //
     // Get the previously created MPedestalCam into the new Parameter List 
     //
-    plist2.AddToList((MPedestalCam*)plist.FindObject("MPedestalCam"));
+    plist2.AddToList(&pedcam);
+    plist2.AddToList(&sigcam);
+    plist2.AddToList(&calcam);
 
     //
@@ -108,6 +112,13 @@
     read2.DisableAutoScheme();
 
-    MExtractSignal        sigsig;
+    MExtractSignal       sigsig;
     MCalibrationCalc     calcalc;
+
+    //
+    // In case, we want to exclude a pre-defined list of bad pixels:
+    // (This is a preliminary feature)
+    //
+    //    calcalc.ExcludePixelsFromAsciiFile("badpixels.dat");
+    
     //
     // As long, as we don't have digital modules, 
@@ -115,11 +126,15 @@
     //
     calcalc.SetPulserColor(MCalibrationCalc::kECT1);
+
+    //
+    // In case, we want to apply another fit function to the 
+    // blind pixel 
+    //
+    MCalibrationBlindPix *bp = calcam.GetBlindPixel();
+    bp->ChangeFitFunc(MHCalibrationBlindPixel::kEPoisson5);
 
     tlist2.AddToList(&read2);
     tlist2.AddToList(&sigsig);
     tlist2.AddToList(&calcalc);
-
-    MExtractedSignalCam   sigcam;
-    plist2.AddToList(&sigcam);
 
     //
@@ -219,5 +234,5 @@
 
     CamDraw(c1,disp1,cam,1,2,1);
-    CamDraw(c1,disp3,cam,2,2,3);
+    CamDraw(c1,disp3,cam,2,2,2);
 
     // Fit Probability