Index: /trunk/MagicSoft/Mars/Changelog
===================================================================
--- /trunk/MagicSoft/Mars/Changelog	(revision 3123)
+++ /trunk/MagicSoft/Mars/Changelog	(revision 3124)
@@ -26,4 +26,5 @@
    * mcalib/MHCalibrationPixel.[h,cc], mcalib/MCalibrationPix.[h,cc],
      mcalib/MCalibrationCalc.[h,cc]
+     macros/calibration.C
      - implemented new histograms: 
        HSinglePheFADCSlices and HPedestalFADCSlices
@@ -32,9 +33,4 @@
        variable: MCalibrationCalc::fBlindPixelSinglePheCut, to be set 
        with a setter 
-     - as the blind pixel signal seems to be delayed a bit, the 
-       extraction range is now by default: 10,20. The extractor takes 
-       already care of the fact that part of the signal lies in the 
-       LoGain Sample. 
-
 
 
Index: /trunk/MagicSoft/Mars/macros/calibration.C
===================================================================
--- /trunk/MagicSoft/Mars/macros/calibration.C	(revision 3123)
+++ /trunk/MagicSoft/Mars/macros/calibration.C	(revision 3124)
@@ -26,6 +26,9 @@
 //const TString calfile = "/mnt/users/mdoro/Mars/Data/20040201_1441*_C_OffMrk421-1_E.root";
 
-const TString pedfile = "/mnt/Data/rootdata/CrabNebula/2004_01_27/20040126_12386_P_Cab-On_E.root";
-const TString calfile = "/mnt/Data/rootdata/CrabNebula/2004_01_27/20040126_12525_C_Cab-On_E.root";
+const TString pedfile = "/mnt/Data/rootdata/CrabNebula/2004_02_10/20040210_14607_P_CrabNebula_E.root";
+const TString calfile = "/mnt/Data/rootdata/CrabNebula/2004_02_10/20040210_14608_C_CrabNebula_E.root";
+
+//const TString pedfile = "/mnt/Data/rootdata/CrabNebula/2004_01_26/20040125_10412_P_Crab-On_E.root";
+//const TString calfile = "/mnt/Data/rootdata/CrabNebula/2004_01_26/20040125_1041*_C_Crab-On_E.root";
 
 //const TString pedfile = "/mnt/Data/rootdata/Miscellaneous/2003_12_19/20031218_03522_P_Park_E.root";
@@ -220,4 +223,53 @@
     MCalibrationCalc     calcalc;
     
+    //
+    // Set the range (other than default) 
+    // of FADC slices for the blind pixel
+    //
+    // calcalc.SetBlindPixelRange(10,25);
+
+    //
+    // Set the cut upon which a superposition of the blind pixel 
+    // FADC slices will be filled into the SinglePHE histogram
+    //
+    calcalc.SetBlindPixelSinglePheCut(500);
+
+    //
+    // Skip the HiGain vs. LoGain calibration
+    // 
+    calcalc.SkipHiLoGainCalibration();
+
+    //
+    // As long, as we don't have digital modules, 
+    // we have to set the color of the pulser LED by hand
+    //
+    calcalc.SetPulserColor(MCalibrationCalc::kECT1);
+
+    //
+    // In case, we want to exclude a pre-defined list of bad pixels:
+    // (This is a preliminary feature)
+    //
+    // calcalc.ExcludePixelsFromAsciiFile("badpixels.dat");
+    
+    //
+    // In case, you want to skip the blind pixel method: 
+    // (NOT RECOMMENDED!!!)
+    //
+    // calcalc.SkipBlindPixelFit();
+
+    //
+    // In case, you want to skip the quality checks
+    // (NOT RECOMMENDED!!!)
+    //
+    // calcalc.SkipQualityChecks();
+
+    //
+    // In case, we want to apply another fit function to the 
+    // blind pixel 
+    //
+    MCalibrationBlindPix *bp = calcam.GetBlindPixel();
+//    bp->ChangeFitFunc(MHCalibrationBlindPixel::kEPolya);
+    bp->ChangeFitFunc(MHCalibrationBlindPixel::kEPoisson5);
+
     // 
     // Apply a filter against cosmics
@@ -226,47 +278,4 @@
     MFCosmics            cosmics;
     MContinue            cont(&cosmics);
-
-    //
-    // Skip the HiGain vs. LoGain calibration
-    // 
-    calcalc.SkipHiLoGainCalibration();
-
-    //
-    // Making the step size a bit bigger, gives us 
-    // faster results
-    // 
-    //    timecalc.SetStepSize(0.05);
-
-    //
-    // As long, as we don't have digital modules, 
-    // we have to set the color of the pulser LED by hand
-    //
-    calcalc.SetPulserColor(MCalibrationCalc::kECT1);
-
-    //
-    // In case, we want to exclude a pre-defined list of bad pixels:
-    // (This is a preliminary feature)
-    //
-   calcalc.ExcludePixelsFromAsciiFile("badpixels.dat");
-    
-    //
-    // In case, you want to skip the blind pixel method: 
-    // (NOT RECOMMENDED!!!)
-    //
-    // calcalc.SkipBlindPixelFit();
-
-    //
-    // In case, you want to skip the quality checks
-    // (NOT RECOMMENDED!!!)
-    //
-    // calcalc.SkipQualityChecks();
-
-    //
-    // In case, we want to apply another fit function to the 
-    // blind pixel 
-    //
-    MCalibrationBlindPix *bp = calcam.GetBlindPixel();
-//    bp->ChangeFitFunc(MHCalibrationBlindPixel::kEPolya);
-//    bp->ChangeFitFunc(MHCalibrationBlindPixel::kEPoisson4);
 
     tlist2.AddToList(&read2);
@@ -298,10 +307,11 @@
     // print the most important results of all pixels
     //
-    calcam.Print();
+    //    calcam.Print();
 
     //
     // just one example how to get the plots of individual pixels
     //
-    calcam[543].DrawClone();
+    //    calcam[563].DrawClone();
+    //    calcam[564].DrawClone();
 
     // Create histograms to display
Index: /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc	(revision 3123)
+++ /trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc	(revision 3124)
@@ -115,6 +115,6 @@
 const UInt_t MCalibrationCalc::fPINDiodeId   = 9999;
 const Byte_t MCalibrationCalc::fgSaturationLimit = 254;
-const Int_t  MCalibrationCalc::fgBlindPixelFirst = 10;
-const Int_t  MCalibrationCalc::fgBlindPixelLast  = 20;
+const Int_t  MCalibrationCalc::fgBlindPixelFirst = 3;
+const Int_t  MCalibrationCalc::fgBlindPixelLast  = 14;
 const Int_t  MCalibrationCalc::fgBlindPixelSinglePheCut = 400;
 
Index: /trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.h
===================================================================
--- /trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.h	(revision 3123)
+++ /trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.h	(revision 3124)
@@ -26,6 +26,6 @@
   static const Double_t fgBlindPixelElectronicAmpError;
 
-  static const Int_t   fPSDNbins;
-  static const Int_t   fPulserFrequency;
+  static const Int_t    fPSDNbins;
+  static const Int_t    fPulserFrequency;
   
   TH1I* fHBlindPixelCharge;        // Histogram with the single Phe spectrum
@@ -99,5 +99,4 @@
 
   enum     { kFitOK, kOscillating };
-
   
 public:
@@ -176,5 +175,4 @@
   Bool_t CheckOscillations();
 
-  
 private: