Changeset 2272

Timestamp:

07/10/03 12:34:10 (21 years ago)

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• macros/CT1EgyEst.C (modified) (8 diffs)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/MCT1SupercutsCalc.cc (modified) (3 diffs)
• manalysis/MCT1SupercutsCalc.h (modified) (3 diffs)
• manalysis/MEnergyEstParamDanielMkn421.cc (added)
• manalysis/MEnergyEstParamDanielMkn421.h (added)
• manalysis/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/macros/CT1EgyEst.C

@@ -33 +33 @@
 #include "MHMatrix.h"
 #include "MEnergyEstParam.h"
+#include "MEnergyEstParamDanielMkn421.h"
 #include "MMatrixLoop.h"
 #include "MChisqEval.h"
@@ -138 +139 @@
   Optimize.SetOutFile(paramout);
 
-  /*
+  
   MFCT1SelFinal filterhadrons;
   filterhadrons.SetHadronnessName(hadronnessName);
@@ -144 +145 @@
   filterhadrons.SetInverted();
   Optimize.SetEventFilter(&filterhadrons);
-  */
+  
 
   Optimize.SetNevents(howMany);
@@ -205 +206 @@
   //
 
-  MEnergyEstParam eest2(hilName);
+  //MEnergyEstParam eest2(hilName);
+  //eest2.Add(hilSrcName);
+
+  //eest2.SetCoeffA(parA);
+  //eest2.SetCoeffB(parB);
+
+  // estimate energy using Daniel's parameters
+  MEnergyEstParamDanielMkn421 eest2(hilName);
   eest2.Add(hilSrcName);
-
-  eest2.SetCoeffA(parA);
-  eest2.SetCoeffB(parB);
 
 
@@ -238 +243 @@
   // Select events
   //
-
-  /*
+  
   cout << "Select events with hadronness < " << maxhadronness 
         << " and |alpha| < " << maxalpha << endl; 
@@ -247 +251 @@
 
   MContinue cont(&hcut2);
-  */
-
-  parlist2.AddToList(&tlist2);
-
-  //********************************
-  // Entries in MTaskList
-
-  tlist2.AddToList(&read2);
-  //  tlist2.AddToList(&cont);
-  tlist2.AddToList(&eest2);
-
-  //
+  
+  //-----------------------------------------------
   // Create Object MHMcEnergyMigration containing useful histograms,
   // and task MHMcEnergyMigration to fill them:
   //
 
-  MHMcEnergyMigration mighist;
-
-  parlist2.AddToList(&mighist);
-
-  MFillH migfill(&mighist, "MMcEvt");
-
-  tlist2.AddToList(&migfill);
-
-  parlist2.AddToList(binsE);
-  parlist2.AddToList(binsTheta);
+  //MHMcEnergyMigration mighist;
+
+  MFillH migfill("MHMcEnergyMigration", "MMcEvt");
 
   MBinning BinningDE("BinningDE");
@@ -279 +266 @@
   BinningDE.SetEdges(60, -1.2, 1.2);
   BinningImpact.SetEdges(50, 0., 400.);
+
+  //********************************
+  // Entries in MParList
+
+  parlist2.AddToList(&tlist2);
+  //parlist2.AddToList(&mighist);
+  parlist2.AddToList(binsE);
+  parlist2.AddToList(binsTheta);
   parlist2.AddToList(&BinningDE);
   parlist2.AddToList(&BinningImpact);
 
+  //********************************
+  // Entries in MTaskList
+
+  tlist2.AddToList(&read2);
+  tlist2.AddToList(&cont);
+  tlist2.AddToList(&eest2);
+  tlist2.AddToList(&migfill);
+
+  //-----------------------------------------------
   cout << "Event loop was setup" << endl; 
   MProgressBar bar;
@@ -291 +295 @@
   if (!evtloop2.Eventloop())
     return;
+
+  tlist2.PrintStatistics(0, kTRUE);
+
+  MHMcEnergyMigration &mighist = 
+    *(MHMcEnergyMigration*)parlist2->FindObject("MHMcEnergyMigration");
+  if (!&mighist)
+  {
+    cout << "CT1EgyEst.C : object 'MHMcEnergyMigration' not found ... aborting"
+         << endl;
+    return;
+  }
 
   TString paramout(outPath);

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -30 +30 @@
 #pragma link C++ class MEnergyEstimate+;
 #pragma link C++ class MEnergyEstParam+;
+#pragma link C++ class MEnergyEstParamDanielMkn421+;
 
 #pragma link C++ class MMatrixLoop+;

trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.cc

@@ -144 +144 @@
     fAlphaUp[7] = 0.;
     //---------------------------------
+}
+
+// --------------------------------------------------------------------------
+//
+// Set the parameter values from vector 'par'
+//
+// Attention : it is assumed that there are (9*ncutpar) values
+//
+void MCT1SupercutsCalc::SetParams(Double_t *par)
+{
+    UInt_t ncutpar = fLengthUp.GetSize();
+    UInt_t k0 = 0;
+
+    TArrayD lup(ncutpar,     par + k0);
+    SetLengthUp(lup);
+    k0 += ncutpar;
+
+    TArrayD wup(ncutpar,     par + k0);
+    SetWidthUp(wup);
+    k0 += ncutpar;
+
+    TArrayD dup(ncutpar,     par + k0);
+    SetDistUp(dup);
+    k0 += ncutpar;
+
+    TArrayD llo(ncutpar,     par + k0);
+    SetLengthLo(llo);
+    k0 += ncutpar;
+
+    TArrayD wlo(ncutpar,     par + k0);
+    SetWidthLo(wlo);
+    k0 += ncutpar;
+
+    TArrayD dlo(ncutpar,     par + k0);
+    SetDistLo(dlo);
+    k0 += ncutpar;
+
+    TArrayD aup(ncutpar,     par + k0);
+    SetAsymUp(aup);
+    k0 += ncutpar;
+
+    TArrayD alo(ncutpar,     par + k0);
+    SetAsymLo(alo);
+    k0 += ncutpar;
+
+    TArrayD alphaup(ncutpar, par + k0);
+    SetAlphaUp(alphaup);
+}
+
+// --------------------------------------------------------------------------
+//
+// Get the parameter values 
+//
+// Attention : it is assumed that there are (9*ncutpar) values
+//
+void MCT1SupercutsCalc::GetParams(Double_t *par)
+{
+    UInt_t ncutpar = fLengthUp.GetSize();
+    UInt_t k0 = 0;
+
+    for (UInt_t j=0; j<ncutpar; j++)
+    {
+      UInt_t k = k0 + j;
+      par[k] = fLengthUp[j];
+    }
+    k0 += ncutpar;
+
+    for (UInt_t j=0; j<ncutpar; j++)
+    {
+      UInt_t k = k0 + j;
+      par[k] = fWidthUp[j];
+    }
+    k0 += ncutpar;
+
+    for (UInt_t j=0; j<ncutpar; j++)
+    {
+      UInt_t k = k0 + j;
+      par[k] = fDistUp[j];
+    }
+    k0 += ncutpar;
+
+    for (UInt_t j=0; j<ncutpar; j++)
+    {
+      UInt_t k = k0 + j;
+      par[k] = fLengthLo[j];
+    }
+    k0 += ncutpar;
+
+    for (UInt_t j=0; j<ncutpar; j++)
+    {
+      UInt_t k = k0 + j;
+      par[k] = fWidthLo[j];
+    }
+    k0 += ncutpar;
+
+    for (UInt_t j=0; j<ncutpar; j++)
+    {
+      UInt_t k = k0 + j;
+      par[k] = fDistLo[j];
+    }
+    k0 += ncutpar;
+
+    for (UInt_t j=0; j<ncutpar; j++)
+    {
+      UInt_t k = k0 + j;
+      par[k] = fAsymUp[j];
+    }
+    k0 += ncutpar;
+
+    for (UInt_t j=0; j<ncutpar; j++)
+    {
+      UInt_t k = k0 + j;
+      par[k] = fAsymLo[j];
+    }
+    k0 += ncutpar;
+
+    for (UInt_t j=0; j<ncutpar; j++)
+    {
+      UInt_t k = k0 + j;
+      par[k] = fAlphaUp[j];
+    }
 }
 
@@ -275 +396 @@
     fMap[5] = fMatrix->AddColumn("MHillas.fMeanY");
     fMap[6] = fMatrix->AddColumn("MHillasSrc.fDist");
+    fMap[7] = fMatrix->AddColumn("MHillasSrc.fAlpha");
 }
 
@@ -332 +454 @@
     return kTRUE;
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
+//==========================================================================

trunk/MagicSoft/Mars/manalysis/MCT1SupercutsCalc.h

@@ -34 +34 @@
     Double_t    fMm2Deg;
 
-    Int_t     fMap[7];
+    Int_t     fMap[8];
     MHMatrix *fMatrix;
 
@@ -70 +70 @@
                       const char *name=NULL, const char *title=NULL);
 
+    void SetParams(Double_t *par);
+    void GetParams(Double_t *par);
+
     void SetHadronnessName(const TString name) { fHadronnessName = name; }
     TString GetHadronnessName() const { return fHadronnessName; }
@@ -100 +103 @@
 
 #endif
+
+
+
+
+
+
+
+

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -39 +39 @@
            MEnergyEstimate.cc \
            MEnergyEstParam.cc \
+           MEnergyEstParamDanielMkn421.cc \
            MSrcPosCam.cc \
            MHadronness.cc \