Changeset 1947 for trunk/MagicSoft/Mars/manalysis

Timestamp:

04/11/03 19:42:54 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MCT1SupercutsCalc.cc (modified) (3 diffs)
• MMultiDimDistCalc.cc (modified) (1 diff)
• MParameters.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc

@@ -136 +136 @@
 //
 MCT1SupercutsCalc::MCT1SupercutsCalc(const char *hilname, 
-               const char *hilsrcname, const char *name, const char *title) 
+                                     const char *hilsrcname, const char *name, const char *title)
+: fHadronnessName("MHadronness"), fHilName(hilname), fHilSrcName(hilsrcname)
 {
     fName  = name  ? name  : "MCT1SupercutsCalc";
     fTitle = title ? title : "Class to evaluate the Supercuts";
 
-    fHilName    = hilname;
-    fHilSrcName = hilsrcname;
-
     InitParams();
 }
@@ -186 +184 @@
         return kFALSE;
     }
-
 
     fCam = (MGeomCam*)pList->FindObject("MGeomCam");
@@ -274 +271 @@
   //      << 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);
+  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->SetHadronness(0.75);
+
+  fHadronness->SetReadyToSave();
 
   return kTRUE;

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

@@ -210 +210 @@
 
     fHadronness->SetHadronness(dg==0 ? 0 : exp(-dh/dg));
+    fHadronness->SetReadyToSave();
 
     return kTRUE;

trunk/MagicSoft/Mars/manalysis/MParameters.cc

@@ -42 +42 @@
 ClassImp(MParameterD);
 ClassImp(MParameterI);
+//ClassImp(MParameter);
 
 // --------------------------------------------------------------------------
@@ -50 +51 @@
 {
     fName  = name  ? name  : "MParameterD";
-    fTitle = title ? title : "Storgare container for general parameters";
+    fTitle = title ? title : "Storgare container for general parameters (double)";
 }
 
@@ -60 +61 @@
 {
     fName  = name  ? name  : "MParameterI";
-    fTitle = title ? title : "Storgare container for general parameters";
+    fTitle = title ? title : "Storgare container for general parameters (integer)";
 }