Changeset 1852 for trunk/MagicSoft

Timestamp:

03/21/03 11:10:36 (22 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/CT1EnergyEst.C (added)
• manalysis/MEnergyEstParam.cc (modified) (8 diffs)
• manalysis/MEnergyEstParam.h (modified) (2 diffs)
• mhist/MHMatrix.cc (modified) (3 diffs)
• mhist/MHMatrix.h (modified) (2 diffs)
• mhist/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/03/21: Thomas Bretz
+    * manalysis/MEnergyEstParam.[h,cc]
+      - Added StopMapping and Print functions.
+
+ 2003/03/21: Abelardo Moralejo
+
+    * mhist/MHMatrix.[h,cc]:
+      - Added third argument (a filter) to the second instantiation 
+        of the Fill procedure.
+
+    * macros/CT1EnergyEst.C:
+      - Example of the parameter calculation and use of the energy 
+        estimation method for CT1.
+
 
  2003/03/21: Thomas Bretz

trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.cc

@@ -177 +177 @@
 // --------------------------------------------------------------------------
 //
-// Set the four coefficients for the estimation of the impact parameter.
+// Set the five coefficients for the estimation of the impact parameter.
 // Argument must ba a TArrayD of size 5.
 //
@@ -193 +193 @@
 // --------------------------------------------------------------------------
 //
-// Set the four coefficients for the estimation of the energy.
+// Set the seven coefficients for the estimation of the energy.
 // Argument must ba a TArrayD of size 7.
 //
@@ -209 +209 @@
 // --------------------------------------------------------------------------
 //
-// Set the four coefficients for the estimation of impact and energy.
+// Set the twelve coefficients for the estimation of impact and energy.
 // Argument must ba a TArrayD of size 12.
 //
@@ -261 +261 @@
 }
 
+void MEnergyEstParam::StopMapping()
+{
+    fMatrix = NULL; 
+    fPairs->Clear();
+    fHillasSrc->Clear();
+    fEnergy->Clear();
+}
+
 // --------------------------------------------------------------------------
 //
@@ -272 +280 @@
 
     AddToBranchList(hillas+".fDist");
+}
+
+void MEnergyEstParam::Print(Option_t *opt)
+{
+    for (int i=0; i<fA.GetSize(); i++)
+      *fLog << all << "fA[" << i << "]=" << fA[i] << endl;
+    for (int i=0; i<fB.GetSize(); i++)
+      *fLog << all << "fB[" << i << "]=" << fB[i] << endl;
 }
 
@@ -295 +311 @@
 
     /* MY PARAM */
-    const Double_t e1 = fB[0] + fB[1]*size + fB[3]*length + fB[4]*size*width;
-    const Double_t e2 = fB[2] + fB[5]*size*width;
+    //const Double_t e1 = fB[0] + fB[1]*size + fB[3]*length + fB[4]*size*width;
+    //const Double_t e2 = fB[2] + fB[5]*size*width;
 
     /* MARCOS */
-    //const Double_t e1 = fB[0] + fB[1]*size + fB[3]*length + fB[4]*size*length;
-    //const Double_t e2 = fB[2] + fB[5]*length;
+    const Double_t e1 = fB[0] + fB[1]*size + fB[3]*length + fB[4]*size*length;
+    const Double_t e2 = fB[2] + fB[5]*length;
 
     TIter NextH(fHillasSrc);
@@ -317 +333 @@
 
         /* MARCOS */
-        //const Double_t ir = i0 * (i1 + fA[1]*dist); // [cm]
-        /*const*/// Double_t er = e0 * (e1 + e2*ir);      // [GeV]
+        const Double_t ir = i0 * (i1 + fA[1]*dist); // [cm]
+        /*const*/ Double_t er = e0 * (e1 + e2*0/*ir*/);      // [GeV]
 
         /* MY PARAM */
         // if (width==0) return kCONTINUE;
-        const Double_t ir = i0 * (i1 + dist*(fA[1]/width + fA[4]/log10(size))); // [cm]
-        Double_t er = e0 * (e1 + e2*ir);      // [GeV]
+        //const Double_t ir = i0 * (i1 + dist*(fA[1]/width + fA[4]/log10(size))); // [cm]
+        //Double_t er = e0 * (e1 + e2*ir);      // [GeV]
 
         /* MKA */
@@ -339 +355 @@
         }
 
-        est->SetEnergy(er);
+        est->SetEnergy(er);
         est->SetImpact(ir);
         est->SetReadyToSave();

trunk/MagicSoft/Mars/manalysis/MEnergyEstParam.h

@@ -50 +50 @@
 
     void InitMapping(MHMatrix *mat);
+    void StopMapping();
 
     Int_t GetNumCoeff() const { return fA.GetSize()+fB.GetSize(); }
@@ -57 +58 @@
     void SetCoeffB(const TArrayD &arr);
 
+    void Print(Option_t *o=NULL);
+
     ClassDef(MEnergyEstParam, 0) // Task to estimate the energy
 };

trunk/MagicSoft/Mars/mhist/MHMatrix.cc

@@ -68 +68 @@
 #include "MData.h"
 #include "MDataArray.h"
+#include "MF.h"
+
 
 ClassImp(MHMatrix);
@@ -600 +602 @@
 // --------------------------------------------------------------------------
 //
-Bool_t MHMatrix::Fill(MParList *plist, MTask *read)
+Bool_t MHMatrix::Fill(MParList *plist, MTask *read, MF *filter)
 {
     //
@@ -614 +616 @@
 
     tlist.AddToList(read);
+
+
+    if (filter)
+      {
+        tlist.AddToList(filter);
+        fillh.SetFilter(filter);
+      }
+
     tlist.AddToList(&fillh);
+
 
     MEvtLoop evtloop;

trunk/MagicSoft/Mars/mhist/MHMatrix.h

@@ -22 +22 @@
 class MParList;
 class MDataArray;
+class MF;
 
 class MHMatrix : public MH
@@ -92 +93 @@
     Double_t operator[](Int_t col) { return fM(fRow, col); }
 
-    Bool_t Fill(MParList *plist, MTask *read);
+    Bool_t Fill(MParList *plist, MTask *read, MF *filter=0);
 
     TString GetDataMember() const;

trunk/MagicSoft/Mars/mhist/Makefile

@@ -23 +23 @@
 #
 INCLUDES = -I. -I../mbase -I../mraw -I../manalysis -I../mmc \
-           -I../mgui -I../mgeom -I../mdata
+           -I../mgui -I../mgeom -I../mdata -I../mfilter
 
 #------------------------------------------------------------------------------