Index: trunk/Mars/fact/analysis/star.C
===================================================================
--- trunk/Mars/fact/analysis/star.C	(revision 17894)
+++ trunk/Mars/fact/analysis/star.C	(revision 17895)
@@ -1,9 +1,8 @@
 #include "MLogManip.h"
 
-int star(const char *seqfile="sequences/20111205_013.seq", Double_t lvl1=4.0, Double_t lvl2=2.5, const char *inpath = "output", const char *outpath = "output")
+int star(const char *seqfile="sequences/20111205_013.seq",
+         const char *inpath = "callisto_new", const char *outpath = "callisto_new")
 {
     double deltat = 17.5;
-    //    lvl1 = 2.5;
-    //    lvl2 = 0.5;
 
     // The sequence file which defines the files for the analysis
@@ -109,12 +108,13 @@
 
     MContinue cont("MRawEvtHeader.GetTriggerID!=4", "SelectData");
+    //MContinue cont("(MRawEvtHeader.GetTriggerID&0xff00)!=0",     "SelectDat");
+    //MContinue cont("(MRawEvtHeader.GetTriggerID&0xff00)!=0x400", "SelectPed");
 
     MGeomApply apply;
 
-    MImgCleanStd clean(lvl1, lvl2);
-    clean.SetMethod(MImgCleanStd::kAbsolute);
-    clean.SetTimeLvl1(deltat);//17.5/*1.3*/);
-    clean.SetTimeLvl2(deltat);//17.5/*1.3*/);
-    clean.SetPostCleanType(3);
+    MImgCleanTime clean;
+    clean.SetMinCount(0);
+    clean.SetMinSize(25);
+    clean.SetDeltaT(1.25*17.5*0.1111);
 
     MHillasCalc hcalc;
@@ -296,13 +296,2 @@
     return 0;
 }
-
-int star(const ULong64_t seqnum, Double_t lvl1=4.0, Double_t lvl2=2.5, const char *inpath = "output", const char *outpath = "output")
-{
-    UInt_t night = seqnum/1000;
-    UInt_t num   = seqnum%1000;
-
-    TString file = Form("/scratch/fact/sequences/%04d/%02d/%02d/%06d_%03d.seq",
-                        night/10000, (night/100)%100, night%100, num);
-
-    return star(file.Data(), lvl1, lvl2, inpath, outpath);
-}