Index: trunk/MagicSoft/Mars/Changelog
===================================================================
--- trunk/MagicSoft/Mars/Changelog	(revision 2029)
+++ trunk/MagicSoft/Mars/Changelog	(revision 2030)
@@ -100,4 +100,9 @@
      - added MHillasExt to be displayed
      - added MNewImagePar to be displayed
+
+   * manalysis/MCT1SupercutsCalc.[h,cc]:
+     - removed empty destructor
+     - fixed output in PreProcess
+     - changed MHillasExt to MHillas
 
 
Index: trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc	(revision 2029)
+++ trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc	(revision 2030)
@@ -147,50 +147,39 @@
 // --------------------------------------------------------------------------
 //
-MCT1SupercutsCalc::~MCT1SupercutsCalc() 
-{
-}
-
-
-// --------------------------------------------------------------------------
-//
 Bool_t MCT1SupercutsCalc::PreProcess(MParList *pList)
 {
+    fHil = (MHillas*)pList->FindObject(fHilName, "MHillas");
+    if (!fHil)
+    {
+        *fLog << err << fHilName << " [MHillasExt] not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fHilSrc = (MHillasSrc*)pList->FindObject(fHilSrcName, "MHillasSrc");
+    if (!fHilSrc)
+    {
+        *fLog << err << fHilSrcName << " [MHillasSrc] not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt");
+    if (!fMcEvt)
+    {
+        *fLog << err << "MMcEvt not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    MGeomCam *cam = (MGeomCam*)pList->FindObject("MGeomCam");
+    if (!cam)
+    {
+        *fLog << err << "MGeomCam (Camera Geometry) not found... aborting." << endl;
+        return kFALSE;
+    }
+
+    fMm2Deg = cam->GetConvMm2Deg();
+
     fHadronness = (MHadronness*)pList->FindCreateObj("MHadronness", fHadronnessName);
     if (!fHadronness)
-    {
-      *fLog << dbginf << "MHadronness object " << fHadronnessName << " not found... aborting." << endl;
-      return kFALSE;
-    }
-
-
-    fHil    = (MHillasExt*)pList->FindObject(fHilName, "MHillasExt");
-    if (!fHil)
-    {
-      *fLog << dbginf << "MHillasExt object " << fHilName << " not found... aborting." << endl;
-      return kFALSE;
-    }
-
-    fHilSrc = (MHillasSrc*)pList->FindObject(fHilSrcName, "MHillasSrc");
-    if (!fHilSrc)
-    {
-      *fLog << dbginf << "MHillasSrc object " << fHilSrcName << " not found... aborting." << endl;
-      return kFALSE;
-    }
-
-    fMcEvt = (MMcEvt*)pList->FindObject("MMcEvt");
-    if (!fMcEvt)
-    {
-        *fLog << dbginf << "MMcEvt not found... aborting." << endl;
-        return kFALSE;
-    }
-
-    fCam = (MGeomCam*)pList->FindObject("MGeomCam");
-    if (!fCam)
-    {
-        *fLog << dbginf << "MGeomCam (Camera Geometry) missing in Parameter List... aborting." << endl;
-        return kFALSE;
-    }
-
-    fMm2Deg = fCam->GetConvMm2Deg();
+        return kFALSE;
 
     return kTRUE;
@@ -204,35 +193,36 @@
                                     Double_t ls2, Double_t dd2)
 {
-  // define cut-function
-  //
-  //    dNOMLOGSIZE = 4.1 (=log(60.0)
-  //    dNOMCOSZA   = 1.0
-  //
-  //      a: array of cut parameters
-  //     ls: log(SIZE) - dNOMLOGSIZE
-  //    ls2: ls^2
-  //     ct: Cos(ZA.) - dNOMCOSZA
-  //    dd2: DIST^2
+    // define cut-function
+    //
+    //    dNOMLOGSIZE = 4.1 (=log(60.0)
+    //    dNOMCOSZA   = 1.0
+    //
+    //      a: array of cut parameters
+    //     ls: log(SIZE) - dNOMLOGSIZE
+    //    ls2: ls^2
+    //     ct: Cos(ZA.) - dNOMCOSZA
+    //    dd2: DIST^2
 
     const Double_t limit =
-               a[0] + a[1] * dd2 + a[2] * ct  +
+        a[0] + a[1] * dd2 + a[2] * ct  +
         ls  * (a[3] + a[4] * dd2 + a[5] * ct) +
         ls2 * (a[6] + a[7] * dd2);
 
-  //*fLog << "MCT1SupercutsCalc::CtsMCut; *a = "
-  //      << *a     << ",  " << *(a+1) << ",  " << *(a+2) << ",  " 
-  //      << *(a+3) << ",  " << *(a+4) << ",  " << *(a+5) << ",  " 
-  //      << *(a+6) << ",  " << *(a+7) << endl;
-
-  //*fLog << "MCT1SupercutsCalc::CtsMCut; ls, ls2, ct, dd2, limit = " << ls 
-  //      << ",  " << ls2 << ",  " << ct << ",  " << dd2 << ",  "
-  //      << limit << endl; 
-    
-  return limit;
+    //*fLog << "MCT1SupercutsCalc::CtsMCut; *a = "
+    //      << *a     << ",  " << *(a+1) << ",  " << *(a+2) << ",  "
+    //      << *(a+3) << ",  " << *(a+4) << ",  " << *(a+5) << ",  "
+    //      << *(a+6) << ",  " << *(a+7) << endl;
+
+    //*fLog << "MCT1SupercutsCalc::CtsMCut; ls, ls2, ct, dd2, limit = " << ls
+    //      << ",  " << ls2 << ",  " << ct << ",  " << dd2 << ",  "
+    //      << limit << endl;
+
+    return limit;
 }
 
 // ---------------------------------------------------------------------------
 //
-// Evaluate supercuts for CT1 Mkn421 2001 (Daniel Kranich)
+// Evaluate dynamical supercuts for CT1 Mkn421 2001 (Daniel Kranich)
+// optimized for mkn 421 2001 data
 // 
 //          set hadronness to 0.25 if cuts are fullfilled
@@ -241,64 +231,46 @@
 Bool_t MCT1SupercutsCalc::Process()
 {
-  // apply dynamical Scuts 
-  // optimized for mkn 421 2001 data
-
-  Double_t dNOMLOGSIZE = 4.1;
-  Double_t dNOMCOSZA   = 1.0;
-
-
-  Double_t newdist = fHilSrc->GetDist()          * fMm2Deg;
-
-  Double_t xbar    = fHil->GetMeanX();
-  Double_t ybar    = fHil->GetMeanY();
-  Double_t dist    = sqrt(xbar*xbar + ybar*ybar) * fMm2Deg;
-  Double_t dd2     = dist * dist;
-
-  Double_t dmls    = log(fHil->GetSize())           - dNOMLOGSIZE;
-  Double_t dmls2   = dmls * dmls;
-
-  Double_t dmcza = cos(fMcEvt->GetTelescopeTheta()) - dNOMCOSZA;
-
-  Double_t length  = fHil->GetLength()           *fMm2Deg;
-  Double_t width   = fHil->GetWidth()            *fMm2Deg;
-
-  //*fLog << "MCT1SupercutsCalc::Process; dmls, dmcza, dmls2, dd2 = "
-  //      << dmls << ",  " << dmcza << ",  " << dmls2 << ",  "
-  //      << dd2 << endl;
-
-  //*fLog << "MCT1SupercutsCalc::Process; newdist, dist, length, width = "
-  //      << newdist << ",  " << dist << ",  " << length << ",  "
-  //      << width << endl;
-
-  if (newdist < 1.05                                         &&
-      newdist < CtsMCut (fDistUp,   dmls, dmcza, dmls2, dd2) &&
-      newdist > CtsMCut (fDistLo,   dmls, dmcza, dmls2, dd2) &&
-      dist    < 1.05                                         &&
-      length  < CtsMCut (fLengthUp, dmls, dmcza, dmls2, dd2) &&
-      length  > CtsMCut (fLengthLo, dmls, dmcza, dmls2, dd2) &&
-      width   < CtsMCut (fWidthUp,  dmls, dmcza, dmls2, dd2) &&
-      width   > CtsMCut (fWidthLo,  dmls, dmcza, dmls2, dd2) &&
-      //asym  < CtsMCut (asymup,    dmls, dmcza, dmls2, dd2) &&
-      //asym  > CtsMCut (asymlow,   dmls, dmcza, dmls2, dd2) &&
-      dist    < CtsMCut (fDistUp,   dmls, dmcza, dmls2, dd2) &&
-      dist    > CtsMCut (fDistLo,   dmls, dmcza, dmls2, dd2)  )
-      fHadronness->SetHadronness(0.25);
-  else
-      fHadronness->SetHadronness(0.75);
-
-  fHadronness->SetReadyToSave();
-
-  return kTRUE;
-}
-// ---------------------------------------------------------------------------
-
-
-
-
-
-
-
-
-
-
-
+    const Double_t dNOMLOGSIZE = 4.1;
+    const Double_t dNOMCOSZA   = 1.0;
+
+    const Double_t newdist = fHilSrc->GetDist() * fMm2Deg;
+
+    const Double_t xbar    = fHil->GetMeanX();
+    const Double_t ybar    = fHil->GetMeanY();
+    const Double_t dist    = sqrt(xbar*xbar + ybar*ybar) * fMm2Deg;
+    const Double_t dd2     = dist * dist;
+
+    const Double_t dmls    = log(fHil->GetSize()) - dNOMLOGSIZE;
+    const Double_t dmls2   = dmls * dmls;
+
+    const Double_t dmcza = cos(fMcEvt->GetTelescopeTheta()) - dNOMCOSZA;
+
+    const Double_t length  = fHil->GetLength() * fMm2Deg;
+    const Double_t width   = fHil->GetWidth()  * fMm2Deg;
+
+    //*fLog << "MCT1SupercutsCalc::Process; dmls, dmcza, dmls2, dd2 = "
+    //      << dmls << ",  " << dmcza << ",  " << dmls2 << ",  "
+    //      << dd2 << endl;
+
+    //*fLog << "MCT1SupercutsCalc::Process; newdist, dist, length, width = "
+    //      << newdist << ",  " << dist << ",  " << length << ",  "
+    //      << width << endl;
+
+    if (newdist < 1.05                                         &&
+        newdist < CtsMCut (fDistUp,   dmls, dmcza, dmls2, dd2) &&
+        newdist > CtsMCut (fDistLo,   dmls, dmcza, dmls2, dd2) &&
+        dist    < 1.05                                         &&
+        length  < CtsMCut (fLengthUp, dmls, dmcza, dmls2, dd2) &&
+        length  > CtsMCut (fLengthLo, dmls, dmcza, dmls2, dd2) &&
+        width   < CtsMCut (fWidthUp,  dmls, dmcza, dmls2, dd2) &&
+        width   > CtsMCut (fWidthLo,  dmls, dmcza, dmls2, dd2) &&
+        //asym  < CtsMCut (asymup,    dmls, dmcza, dmls2, dd2) &&
+        //asym  > CtsMCut (asymlow,   dmls, dmcza, dmls2, dd2) &&
+        dist    < CtsMCut (fDistUp,   dmls, dmcza, dmls2, dd2) &&
+        dist    > CtsMCut (fDistLo,   dmls, dmcza, dmls2, dd2)  )
+        fHadronness->SetHadronness(0.25);
+    else
+        fHadronness->SetHadronness(0.75);
+
+    return kTRUE;
+}
Index: trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.h
===================================================================
--- trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.h	(revision 2029)
+++ trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.h	(revision 2030)
@@ -27,5 +27,4 @@
     MHillasSrc  *fHilSrc;
     MMcEvt      *fMcEvt;
-    MGeomCam    *fCam;   
     MHadronness *fHadronness;     //! output container for hadronness
 
@@ -51,11 +50,13 @@
     void InitParams();
 
+    Bool_t PreProcess(MParList *pList);
+    Bool_t Process();
+
 public:
-    MCT1SupercutsCalc(const char *hilname="MHillas", 
+    MCT1SupercutsCalc(const char *hilname="MHillasExt",
                        const char *hilsrcname="MHillasSrc",
                        const char *name=NULL, const char *title=NULL);
-    ~MCT1SupercutsCalc();
 
-    Double_t CtsMCut(Double_t *a, Double_t ls, Double_t ct, 
+    Double_t CtsMCut(Double_t *a, Double_t ls, Double_t ct,
                      Double_t ls2, Double_t dd2);
 
@@ -63,14 +64,6 @@
     TString GetHadronnessName() const { return fHadronnessName; }
 
-    Bool_t PreProcess(MParList *pList);
-    Bool_t Process();
-
     ClassDef(MCT1SupercutsCalc, 0) // A class to evaluate the Supercuts
 };
 
 #endif
-
-
-
-
-