Changeset 1947 for trunk/MagicSoft/Mars

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• macros/readMagic.C (modified) (1 diff)
• manalysis/MCT1SupercutsCalc.cc (modified) (3 diffs)
• manalysis/MMultiDimDistCalc.cc (modified) (1 diff)
• manalysis/MParameters.cc (modified) (3 diffs)
• mfilter/MFCT1SelFinal.h (modified) (1 diff)
• mhist/MHHillasExt.cc (deleted)
• mimage/Makefile (modified) (1 diff)
• mraw/MRawEvtData.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/04/11: Thomas Bretz
+
+   * macros/readMagic.C:
+     - replaced GetEventNum by GetNumEntry
+     
+   * manalysis/MCT1SupercutsCalc.cc:
+     - fixed constructor (no default for fHadronnessName)
+     - missing fHadronness->SetReadyToSave added
+     
+   * manalysis/MMultiDimDistCalc.cc:
+     - missing fHadronness->SetReadyToSave added
+    
+   * manalysis/MParameters.cc:
+     - changed title
+
+   * mfilter/MFCT1SelFinal.h:
+     - set ClassDef to 0
+   
+   * mimage/Makefile:
+     - fixed a typo
+     
+   * mraw/MRawEvtData.cc:
+     - fixed Pixel assignment (i->ipos, fPosInArray++)
+
+
 
  2003/04/10: Thomas Bretz
@@ -50 +76 @@
 
    * manalysis/Makefile, manalysis/AnalysisLinkDef.h,
-     mhist/Makefile, mhist/AnalysisLinkDef.h:
+     mhist/Makefile, mhist/AnalysisLinkDef.h, mmain/Makefile,
+     mfilter/Makefile, meventdisp/Makefile, mgui/Makefile:
      - adapted
 

trunk/MagicSoft/Mars/macros/readMagic.C

@@ -98 +98 @@
     while (tlist.Process())
     {
-        cout << "Event #" << read.GetEventNum() ":" << endl;
+        cout << "Event #" << read.GetNumEntry() ":" << endl;
 
         display.DrawPhotNum((MCerPhotEvt*)clone.GetClone());

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)";
 }
 

trunk/MagicSoft/Mars/mfilter/MFCT1SelFinal.h

@@ -56 +56 @@
     void SetCuts(Float_t hadmax, Float_t alphamax); 
 
-    ClassDef(MFCT1SelFinal, 1)   // Class to evaluate final cuts
+    ClassDef(MFCT1SelFinal, 0)   // Class to evaluate final cuts
 };
 

trunk/MagicSoft/Mars/mimage/Makefile

@@ -22 +22 @@
 #  connect the include files defined in the config.mk file
 #
-INCLUDES = -I. -I../mbase -I../mhist -I../mgeom -I../manalysi
+INCLUDES = -I. -I../mbase -I../mhist -I../mgeom -I../manalysis
 
 #------------------------------------------------------------------------------

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -420 +420 @@
         // get the spiral pixel number from the run header
         //
-        const UShort_t npix = fRunHeader->GetPixAssignment(i);
-
         const UShort_t ipos = npos+i;
+
+        const UShort_t npix = fRunHeader->GetPixAssignment(ipos);
+
         //
         //  This is to fill the data of one pixel to the MRawEvtHeader Class.
@@ -440 +441 @@
         //}
     }
-}
-
+
+    fPosInArray++;
+}
+