Index: /trunk/Mars/fact/analysis/mc/callisto.C
===================================================================
--- /trunk/Mars/fact/analysis/mc/callisto.C	(revision 17640)
+++ /trunk/Mars/fact/analysis/mc/callisto.C	(revision 17641)
@@ -92,9 +92,13 @@
     Bool_t maximum = kTRUE;
 
-    const char *lp_template    = maximum ?
-        "/cm/shared/apps/fact/Mars_svn_LP/template-lp-extractor-maximum.root" :
-        "/cm/shared/apps/fact/Mars_svn_LP/template-lp-extractor-leading-edge.root";
-
-    const char *pulse_template = "/cm/shared/apps/fact/Mars_svn_LP/template-pulse.root";
+    //const char *lp_template    = maximum ?
+    //    "/cm/shared/apps/fact/Mars_svn_LP/template-lp-extractor-maximum.root" :
+    //    "/cm/shared/apps/fact/Mars_svn_LP/template-lp-extractor-leading-edge.root";
+
+    const char *lp_template    = "/cm/shared/apps/fact/Mars_Trunk/template-lp.root";
+
+    //const char *pulse_template = "/cm/shared/apps/fact/Mars_svn_LP/template-pulse.root";
+
+    const char *pulse_template = "/cm/shared/apps/fact/Mars_Trunk/template-pulse.root";
 
     // ------------------------------------------------------
@@ -182,11 +186,11 @@
     lpref->SetDirectory(0);
 
-    MHCamera *gain = (MHCamera*)arrt.FindObjectInCanvas("gain", "MHCamera", "Gain");
-    if (!gain)
-    {
-        gLog << err << "ERROR - Gain not found in " << lp_template << endl;
-        return 101;
-    }
-    gain->SetDirectory(0);
+    // MHCamera *gain = (MHCamera*)arrt.FindObjectInCanvas("gain", "MHCamera", "Gain");
+    // if (!gain)
+    // {
+    //     gLog << err << "ERROR - Gain not found in " << lp_template << endl;
+    //     return 101;
+    // }
+    // gain->SetDirectory(0);
 
     TFile fp(pulse_template);
Index: /trunk/Mars/fact/analysis/mc/star.C
===================================================================
--- /trunk/Mars/fact/analysis/mc/star.C	(revision 17640)
+++ /trunk/Mars/fact/analysis/mc/star.C	(revision 17641)
@@ -42,4 +42,5 @@
 #include "MParameters.h"
 #include "MWriteAsciiFile.h"
+#include "MFMagicCuts.h"
 
 #include "MMuonSetup.h"
@@ -288,4 +289,6 @@
     write.AddContainer("MNewImagePar",    "Events");
     write.AddContainer("MRawEvtHeader",   "Events");
+    write.AddContainer("ThetaSquared",   "Events");
+    write.AddContainer("Disp",           "Events");
     write.AddContainer("MRawRunHeader",   "RunHeaders");
     write.AddContainer("MGeomCam",        "RunHeaders");
@@ -294,4 +297,26 @@
     fillmhn2.SetFilter(&fmuonhn);
 
+    TArrayD param(12);
+    // Parametrization of Disp
+    param[0]  =  1.15136;     // constant
+    param[8]  =  0.0681437;   // slope
+    param[9]  =  2.62932;     // leak
+    param[10] =  1.51279;     // size-offset
+    param[11] =  0.0507821;   // size-slope
+    // Parametrization for sign of disp (m3long, slope)
+    param[5]  = -0.07;
+    param[6]  =  7.2;
+    param[7]  =  0.5;
+    // ThetaSq-Cut
+    param[1]  =  0.11;  // 0.215
+    // Area-Cut
+    param[2]  =  0.215468;
+    param[3]  =  5.63973;
+    param[4]  =  0.0836169;
+    MFMagicCuts cuts;
+    cuts.SetHadronnessCut(MFMagicCuts::kNoCut);
+    cuts.SetVariables(param);
+
+
     tlist.AddToList(&read);
     tlist.AddToList(&cont);
@@ -299,4 +324,5 @@
     tlist.AddToList(&clean);
     tlist.AddToList(&hcalc);
+    tlist.AddToList(&cuts);
     tlist.AddToList(&fillC1);
     tlist.AddToList(&fillC2);