Changeset 2272 for trunk/MagicSoft/Mars/manalysis

Timestamp:

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

Author:

wittek

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• AnalysisLinkDef.h (modified) (1 diff)
• MCT1SupercutsCalc.cc (modified) (3 diffs)
• MCT1SupercutsCalc.h (modified) (3 diffs)
• MEnergyEstParamDanielMkn421.cc (added)
• MEnergyEstParamDanielMkn421.h (added)
• Makefile (modified) (1 diff)

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 \