Index: trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard
===================================================================
--- trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard	(revision 4392)
+++ trunk/MagicSoft/Mars/mtemp/mifae/programs/makehillas.datacard	(revision 4393)
@@ -43,10 +43,12 @@
 // -1: kDummy
 //  0: kNone
-//  1: kDefault
-// 11: kDefault + bad pixel interpolation
+//  1: kDefault(F factor)
+//  2: kDemocratic
+// 11: kDefault(F factor) + bad pixel interpolation
+// 21: kDemocratic + bad pixel interpolation
 CALFLAG 11
 
 // Cleaning level
-CLEANLEVEL 3.0 1.5
+CLEANLEVEL 3.0 1.5 1 2
 
 //Island calculations
Index: trunk/MagicSoft/Mars/mtemp/mifae/programs/optimizeCuts.cc
===================================================================
--- trunk/MagicSoft/Mars/mtemp/mifae/programs/optimizeCuts.cc	(revision 4392)
+++ trunk/MagicSoft/Mars/mtemp/mifae/programs/optimizeCuts.cc	(revision 4393)
@@ -113,6 +113,6 @@
   ton->SetAlias("length","MHillas.fLength*0.6/189");
   ton->SetAlias("width","MHillas.fWidth*0.6/189");
-  //  ton->SetAlias("length","MHillas.fLength");
-  //  ton->SetAlias("width","MHillas.fWidth");
+  //ton->SetAlias("length","MHillas.fLength");
+  //ton->SetAlias("width","MHillas.fWidth");
   ton->SetAlias("dist","MHillasSrc.fDist*0.6/189");
   ton->SetAlias("conc","MNewImagePar.fConc");
@@ -120,4 +120,5 @@
   ton->SetAlias("event","MRawEvtHeader.fDAQEvtNumber");
   ton->SetAlias("alpha","abs(MHillasSrc.fAlpha)");
+  ton->SetAlias("leak","MNewImagePar.fInnerLeakage1");
   
   toff->SetAlias("length","MHillas.fLength*0.6/189");
@@ -130,4 +131,5 @@
   toff->SetAlias("event","MRawEvtHeader.fDAQEvtNumber");
   toff->SetAlias("alpha","abs(MHillasSrc.fAlpha)");
+  toff->SetAlias("leak","MNewImagePar.fInnerLeakage1");