Changeset 5448

Timestamp:

11/22/04 11:36:32 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mfbase/MFEventSelector2.cc (modified) (1 diff)
• mfbase/MFEventSelector2.h (modified) (1 diff)
• mfilter/FilterLinkDef.h (modified) (1 diff)
• mfilter/MFSize.cc (deleted)
• mfilter/MFSize.h (deleted)
• mfilter/Makefile (modified) (1 diff)
• mtemp/mpadova/macros/resize.C (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -20 +20 @@
 
                                                  -*-*- END OF LINE -*-*-
+
+ 2004/11/22: Abelardo Moralejo
+
+   * mfbase/MFEventSelector2.cc
+     - Fixed error in Process: calls to Select and SelectProb were 
+       exchanged.
+     - Added example to documentation on how to use the "probability"
+       option.
+
+   * mfbase/MFEventSelector.h
+     - Fixed typo in comment
+
+   * mfilter/MFSize.[h,cc]
+     - removed class. The same kind of filtering can now be done, in  
+       a more versatile way, with MFEventSelector2
+
+   * mfilter/Makefile, FilterLinkDef.h
+     - removed class MFSize
+
+   * mtemp/mpadova/macros/resize.C
+     - Now the class MFEventSelector2 is used instead of the removed
+       MFSize. Behaviour is the same. Default probabilities have been 
+       slightly changed (but this is just an example).
+
 
  2004/11/18: Hendrik Bartko

trunk/MagicSoft/Mars/mfbase/MFEventSelector2.cc

@@ -477 +477 @@
     // Get corresponding bin number and check
     // whether a selection should be made
-    fResult = fHistIsProbability ? Select(ibin) : SelectProb(ibin);
+    fResult = fHistIsProbability ? SelectProb(ibin) : Select(ibin);
 
     fCounter[fResult ? 1 : 0]++;

trunk/MagicSoft/Mars/mfbase/MFEventSelector2.h

@@ -66 +66 @@
     Bool_t IsExpressionTrue() const { return fResult; }
 
-    ClassDef(MFEventSelector2, 0) // FIMXE!
+    ClassDef(MFEventSelector2, 0) // FIXME!
 };
 

trunk/MagicSoft/Mars/mfilter/FilterLinkDef.h

@@ -21 +21 @@
 #pragma link C++ class MFCosmics+;
 
-#pragma link C++ class MFSize+;
-
 #pragma link C++ class MFEnergySlope+;
 

trunk/MagicSoft/Mars/mfilter/Makefile

@@ -32 +32 @@
            MFSoftwareTrigger.cc \
            MFCosmics.cc \
-           MFEnergySlope.cc \
-           MFSize.cc
+           MFEnergySlope.cc
 
 ############################################################

trunk/MagicSoft/Mars/mtemp/mpadova/macros/resize.C

@@ -42 +42 @@
   write.AddContainer("MHillasSrc",     "Events");
 
-  write.AddContainer("MGeomCam", "RunHeaders");
-  write.AddContainer("MMcConfigRunHeader", "RunHeaders");
+  write.AddContainer("MGeomCam",            "RunHeaders");
+  write.AddContainer("MMcConfigRunHeader",  "RunHeaders");
   write.AddContainer("MMcCorsikaRunHeader", "RunHeaders");
-  write.AddContainer("MMcFadcHeader", "RunHeaders");
-  write.AddContainer("MMcTrigHeader", "RunHeaders");
+  write.AddContainer("MMcFadcHeader",       "RunHeaders");
+  write.AddContainer("MMcTrigHeader",       "RunHeaders");
 
-  write.AddContainer("MRawRunHeader", "RunHeaders");
-  write.AddContainer("MSrcPosCam",    "RunHeaders");
-  write.AddContainer("MMcRunHeader",  "RunHeaders");
-
+  write.AddContainer("MRawRunHeader",       "RunHeaders");
+  write.AddContainer("MSrcPosCam",          "RunHeaders");
+  write.AddContainer("MMcRunHeader",        "RunHeaders");
 
   //
@@ -59 +58 @@
   //
 
-  TH1F* h = new TH1F("h", "", 20, 2., 4.);
+  Float_t frac[20] = {0.180451,  0.236564,  0.253332,  0.282566,  0.355083,  
+                      0.424058,  0.566892,  0.657478,  0.753713,  0.738402,  
+                      0.789239,  0.762777,  0.857609,  0.833747,  0.923706,  
+                      1.04348,  0.978622,  0.875537,  0.971831,  1.};
 
-  Float_t frac[20] = {0.144928, 0.171911, 0.18763, 0.209461, 0.253219, 
-                      0.305425, 0.384593, 0.485204, 0.612452, 0.708138, 
-                      0.754522, 0.728028, 0.774046, 0.791422, 0.808775, 
-                      0.896842, 1., 1., 1., 1.};
- 
+
+  TH1F hist("probability", "", 20, 2., 4.);
+  hist.SetXTitle("log10(MHillas.fSize)");
   for (Int_t i = 0; i < 20; i++)
-    h->SetBinContent(i+1, frac[i]);
+    hist.SetBinContent(i+1, frac[i]);
 
-  MFSize fsize;
-  fsize.SetProb(h);
+  MH3 mh(hist);
+  MFEventSelector2 fsize(mh);
+  fsize.SetHistIsProbability(kTRUE);
 
   write.SetFilter(&fsize);