Index: trunk/Mars/hawc/callisto.C
===================================================================
--- trunk/Mars/hawc/callisto.C	(revision 19745)
+++ trunk/Mars/hawc/callisto.C	(revision 19746)
@@ -62,10 +62,10 @@
     MBadPixelsCam badpixels;
     badpixels.InitSize(64);
-    badpixels[40].SetUnsuitable(MBadPixelsPix::kUnsuitable);
+    //badpixels[40].SetUnsuitable(MBadPixelsPix::kUnsuitable);
 
     // Range in which the pulse extraction searches for the
     // pulse (in samples).
-    const int first_slice = 290;
-    const int last_slice  = 350;
+    const int first_slice = 270;
+    const int last_slice  = 330;
 
     // Calibration constant (for the moment a single constant to
@@ -292,5 +292,5 @@
     */
 
-    const TString rule(Form("s/(([0-9]+_)?[0-9.]+)_[PCD]_(.*)([.]fits([.]fz)?)$/%s\\/$1_Y_$3.root/",
+    const TString rule(Form("s/([0-9]+)([._])([0-9]+)(_[DPC])?([_].*)?([.]fits([.]fz)?)$/%s\\/$1$2$3_Y$5.root/",
                             MJob:: Esc(outpath).Data()));