Changeset 7643

Timestamp:

04/21/06 17:28:45 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• mfbase/MFilterList.cc (modified) (1 diff)
• mfbase/MFilterList.h (modified) (1 diff)
• mfilter/MFEnergySlope.cc (modified) (3 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -27 +27 @@
    * mtools/MTFillMatrix.cc:
      - added accelerator for executing the tasklist as in MJCut
+
+   * mfilter/MFEnergySlope.cc:
+     - small update to output
+
+   * mfbase/MFilterList.[h,cc]:
+     - fixed a really old problem that the contents of the list never
+       got ReInit. Hopefully this never had bad sideeffects.
 
 

trunk/MagicSoft/Mars/NEWS

@@ -6 +6 @@
      and optimization macros) by skipping some obsolete calles in the
      eventloop the first and second loop could be accelerated by ~20%
+
+   - general: Fixed a missing feature in the MFilterLIst class which
+     prevented MFEnergySlope from working correctly in trainenergy.C
 
    - merpp: Adapted to new raw data file format version 6

trunk/MagicSoft/Mars/mfbase/MFilterList.cc

@@ -297 +297 @@
 // --------------------------------------------------------------------------
 //
+// ReInit all filters in the list
+//
+Bool_t MFilterList::ReInit(MParList *pList)
+{
+    TIter Next(&fFilters);
+
+    MFilter *filter=NULL;
+
+    //
+    // loop over all filters
+    //
+    while ((filter=(MFilter*)Next()))
+    {
+        if (!filter->ReInit(pList))
+        {
+            *fLog << err << "Error - ReInit Filter ";
+            *fLog << filter->GetName() << " in " << fName << endl;
+            return kFALSE;
+        }
+    }
+
+    return kTRUE;
+}
+
+// --------------------------------------------------------------------------
+//
 // Processes (updates) all filters in the list.
 //

trunk/MagicSoft/Mars/mfbase/MFilterList.h

@@ -55 +55 @@
     TString GetDataMember() const;
 
-    Int_t PreProcess(MParList *pList);
-    Int_t Process();
-    Int_t PostProcess();
+    Bool_t ReInit(MParList *plist);
+    Int_t  PreProcess(MParList *pList);
+    Int_t  Process();
+    Int_t  PostProcess();
 
     void SetAccelerator(Byte_t acc=kAccStandard);

trunk/MagicSoft/Mars/mfilter/MFEnergySlope.cc

@@ -127 +127 @@
 
     //
-    // Read info from the MC sample (it must be generated with
+    // Read info from0 the MC sample (it must be generated with
     //   reflector ver.0.6 and camera ver. 0.6)
     //
@@ -148 +148 @@
     *fLog << inf;
     *fLog << "Fetched MC info:" << endl;
-    *fLog << "  Change E Slope " << fMcSlope << " (" << fMcMinEnergy << " < E < ";
-    *fLog << fMcMaxEnergy << ") to " << fNewSlope << endl;
+    *fLog << "  Change E Slope from " << -fMcSlope << " (" << fMcMinEnergy << " < E < ";
+    *fLog << fMcMaxEnergy << ") to " << -fNewSlope << endl;
     *fLog << "  Norm factor: " << fN0 << endl;
 
@@ -191 +191 @@
      */
 
-    const Float_t Nexp = fN0 * pow(energy,fMcSlope-fNewSlope);
+    const Float_t Nexp = fN0 * pow(energy, fMcSlope-fNewSlope);
     const Float_t Nrnd = gRandom->Uniform();
 
     fResult = Nexp > Nrnd;
-
-    //if (fResult)
-    //    fNumSelectedEvts++;
 
     return kTRUE;