Changeset 1557 for trunk

Timestamp:

10/29/02 13:58:25 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• macros/comprob.C (modified) (2 diffs)
• macros/multidimdist.C (modified) (4 diffs)
• manalysis/AnalysisLinkDef.h (modified) (1 diff)
• manalysis/MCerPhotAnal.cc (modified) (3 diffs)
• manalysis/MHadroness.cc (deleted)
• manalysis/MHadroness.h (deleted)
• manalysis/MHadronness.cc (added)
• manalysis/MHadronness.h (added)
• manalysis/MMultiDimDistCalc.cc (modified) (3 diffs)
• manalysis/MMultiDimDistCalc.h (modified) (1 diff)
• manalysis/Makefile (modified) (1 diff)
• mhist/HistLinkDef.h (modified) (1 diff)
• mhist/MHHadroness.cc (deleted)
• mhist/MHHadroness.h (deleted)
• mhist/MHHadronness.cc (added)
• mhist/MHHadronness.h (added)
• mhist/Makefile (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                                   -*-*- END -*-*-
+ 2002/10/29: Thomas Bretz
+
+   * manalysis/MHadroness.[h,cc]:
+     - renamed to MHadronness
+
+   * mhist/MHHadroness.[h,cc]:
+     - renamed to MHHadronness
+     - small changes to the graphical and text output
+
+   * manalysis/Makefile, manalysis/AnalysisLinkDef.h, macros/multidimdist.C,
+     manalysis/MMultiDimDistCalc.[h,cc], macros/comprob.C,
+     mhist/Makefile, mhist/HistLinkDef.h:
+     - changed Hadroness to Hadronness
+
+   * manalysis/MCerPhotAnal.cc:
+     - small changes to the code layout
+
+
 
  2002/10/24: Thomas Bretz

trunk/MagicSoft/Mars/macros/comprob.C

@@ -113 +113 @@
 
     // fill probabilities (hadroness) into histogram
-    MFillH fill2("MHHadroness");
+    MFillH fill2("MHHadronness");
     tlist2.AddToList(&fill2);
 
@@ -124 +124 @@
     // the console window
     //
-    plist.FindObject("MHHadroness")->DrawClone();
-    plist.FindObject("MHHadroness")->Print();
+    plist.FindObject("MHHadronness")->DrawClone();
+    plist.FindObject("MHHadronness")->Print();
 }
 

trunk/MagicSoft/Mars/macros/multidimdist.C

@@ -48 +48 @@
     //   CalEvents:  Calibration Events
     //
-    MReadMarsFile  read("Events", "~/Mars/star2.root");
+    MReadMarsFile  read("Events", "~/Mars/star.root");
     read.DisableAutoScheme();
     tlist.AddToList(&read);
@@ -107 +107 @@
     plist.Replace(&tlist2);
 
-    MReadMarsFile read2("Events", "~/Mars/star2.root");
+    MReadMarsFile read2("Events", "~/Mars/star.root");
+//    read2.AddFile("~/Mars/star2.root");
     read2.DisableAutoScheme();
     tlist2.AddToList(&read2);
@@ -116 +117 @@
     tlist2.AddToList(&calc);
 
-    MFillH fillh("MHHadroness");
+    MFillH fillh("MHHadronness");
 
     /*
@@ -134 +135 @@
     tlist2.PrintStatistics();
 
-    plist.FindObject("MHHadroness")->DrawClone();
-    plist.FindObject("MHHadroness")->Print();
+    plist.FindObject("MHHadronness")->DrawClone();
+    plist.FindObject("MHHadronness")->Print();
 }

trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h

@@ -21 +21 @@
 #pragma link C++ class MMcPedestalNSBAdd+;
 
-#pragma link C++ class MHadroness+;
+#pragma link C++ class MHadronness+;
 
 #pragma link C++ class MCompProbCalc+;

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc

@@ -123 +123 @@
 
     while (pixel.Next())
-      {
+    {
         Byte_t *ptr = pixel.GetHiGainSamples();
         const Byte_t *end = ptr + fRawEvt->GetNumHiGainSamples();
@@ -134 +134 @@
         Int_t slicelocal=0;
 
-        Float_t nphot;
-        Float_t pedes, sigmaped;
-
-        do 
-          {
-            sumlocal = 0;
-            for(Int_t i = 0; i<5;i++)
-              sumlocal+=*(ptr+i);
-            if (sumpeak < sumlocal){
-              slice=slicelocal;
-              sumpeak = sumlocal;
-            }
-            slicelocal++;
+        do
+        {
+            sumlocal = 0;
+            for (Int_t i = 0; i<5;i++)
+                sumlocal += *(ptr+i);
+
+            if (sumpeak < sumlocal)
+            {
+                slice=slicelocal;
+                sumpeak = sumlocal;
+            }
+
+            slicelocal++;
             sum += *ptr;
-          }
-        while (++ptr != limit);
-
-        do sum += *ptr;
-        while (++ptr != end);
-
-        pedes = (Float_t)(sum-sumpeak)/(fRawEvt->GetNumHiGainSamples()-5);
-        nphot=(Float_t)sumpeak - 5.0*pedes;
-        sigmaped=0;
-        sumlocal=0;
-        slicelocal=0;
+        } while (++ptr != limit);
+
+        do sum += *ptr;
+        while (++ptr != end);
+
+        Float_t pedes = (Float_t)(sum-sumpeak)/(fRawEvt->GetNumHiGainSamples()-5);
+        Float_t nphot = (Float_t)sumpeak - 5.0*pedes;
+
+        Float_t sigmaped=0;
+
+        slicelocal=0;
+        sumlocal = 0;
 
         ptr = pixel.GetHiGainSamples();
-        do {
-          if (slicelocal==slice)
-            ptr+=4;
-          else{
-            sumlocal=*ptr;
-            sigmaped+=((Float_t)sumlocal-pedes)*((Float_t)sumlocal-pedes);
-          }
-          slicelocal++;
+        do
+        {
+            if (slicelocal==slice)
+                ptr += 4;
+            else
+            {
+                sumlocal = *ptr;
+
+                const Float_t d = (Float_t)sumlocal-pedes;
+                sigmaped += d*d;
+            }
+            slicelocal++;
         }
-        while(++ptr != end);
-        sigmaped/=(fRawEvt->GetNumHiGainSamples()-5);
-        sigmaped=sqrt(sumlocal);
+        while (++ptr != end);
+
+        sigmaped /= (fRawEvt->GetNumHiGainSamples()-5);
+        sigmaped = sqrt(sumlocal);
 
         const UInt_t pixid = pixel.GetPixelId();
@@ -188 +194 @@
 
         fCerPhotEvt->AddPixel(pixid, nphot, sigmaped/2.236);
-        ped.SetPedestal(pedes,sigmaped);
+        ped.SetPedestal(pedes, sigmaped);
         ped.SetPedestalRms(sigmaped/sqrt(fRawEvt->GetNumHiGainSamples()-5),
                            sigmaped/sqrt(2*(fRawEvt->GetNumHiGainSamples()-5)));

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.cc

@@ -54 +54 @@
 #include "MDataArray.h"
 
-#include "MHadroness.h"
+#include "MHadronness.h"
 
 ClassImp(MMultiDimDistCalc);
@@ -149 +149 @@
     }
 
-    fHadroness = (MHadroness*)plist->FindCreateObj("MHadroness");
-    if (!fHadroness)
+    fHadronness = (MHadronness*)plist->FindCreateObj("MHadronness");
+    if (!fHadronness)
         return kFALSE;
 
@@ -200 +200 @@
     Double_t dh = fMHadrons->CalcDist(event, numh);
 
-    //fHadroness->SetHadroness(dg/(dg+dh));
-    fHadroness->SetHadroness(exp(-dh/dg));
+    //fHadronness->SetHadronness(dg/(dg+dh));
+    fHadronness->SetHadronness(exp(-dh/dg));
 
     return kTRUE;

trunk/MagicSoft/Mars/manalysis/MMultiDimDistCalc.h

@@ -8 +8 @@
 class MHMatrix;
 class MParList;
-class MHadroness;
 class MDataArray;
+class MHadronness;
 
 class MMultiDimDistCalc : public MTask
 {
 private:
-    Int_t  fNum;            // number of distances used for an avarage
-    Bool_t fUseKernel;      // Flag whether kernel method should be used
+    Int_t  fNum;              // number of distances used for an avarage
+    Bool_t fUseKernel;        // Flag whether kernel method should be used
 
-    MHMatrix   *fMGammas;   //! Gammas describing matrix
-    MHMatrix   *fMHadrons;  //! Hadrons (non gammas) describing matrix
+    MHMatrix   *fMGammas;     //! Gammas describing matrix
+    MHMatrix   *fMHadrons;    //! Hadrons (non gammas) describing matrix
 
-    MHadroness *fHadroness; //! Output container for calculated hadroness
+    MHadronness *fHadronness; //! Output container for calculated hadroness
 
-    MDataArray *fData;      //! Used to store the MDataChains to get the event values
+    MDataArray *fData;        //! Used to store the MDataChains to get the event values
 
     void StreamPrimitive(ofstream &out) const;

trunk/MagicSoft/Mars/manalysis/Makefile

@@ -39 +39 @@
            MSrcPosCam.cc \
            MCameraSmooth.cc \
-           MHadroness.cc \
+           MHadronness.cc \
            MMatrixLoop.cc \
            MCompProbCalc.cc \

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -34 +34 @@
 
 #pragma link C++ class MHCompProb+;
-#pragma link C++ class MHHadroness+;
+#pragma link C++ class MHHadronness+;
 
 #pragma link C++ class MHMcRate+;

trunk/MagicSoft/Mars/mhist/Makefile

@@ -49 +49 @@
            MHTimeDiffTheta.cc \
            MHCompProb.cc \
-           MHHadroness.cc \
+           MHHadronness.cc \
            MHMcEnergy.cc \
            MHMcEfficiency.cc \