Changeset 2251 for trunk/MagicSoft

Timestamp:

06/30/03 10:55:30 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• macros/pixfirerate.C (modified) (3 diffs)
• manalysis/MCerPhotAnal2.h (added)
• manalysis/MCerPhotCalc.cc (modified) (3 diffs)
• manalysis/MCerPhotCalc.h (modified) (1 diff)
• manalysis/MPedestalSum.cc (added)
• mhist/MHCamera.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2003/06/30: Thomas Bretz
+ 
+   * macros/pixfirerate.C:
+     - changed to new style
+     
+   * manalysis/MCerPhotCalc.cc:
+     - scale weight so that sum=1
+     
+   * mhist/MHCamera.h:
+     - small change
+
+
+
  2003/06/27: Abelardo Moralejo
 
-   * mmontecarlo/MMcCollectionAreaCalc.[h,cc]:
-   * mhistmc/MHMcCollectionAreaCalc.[h,cc]:
-
+   * mmontecarlo/MMcCollectionAreaCalc.[h,cc],
+     mhistmc/MHMcCollectionAreaCalc.[h,cc]:
      - Adapted to allow their use with multiple files containing
        MC data generated with diffferent energy spectra, even with
@@ -13 +25 @@
        is done by CalcEfficiency2(). Some simplifications and cleaning 
        are still possible.
+
+
 
  2003/06/27: Thomas Bretz

trunk/MagicSoft/Mars/macros/pixfirerate.C

@@ -36 +36 @@
 /////////////////////////////////////////////////////////////////////////////
 
-void pixfirerate(TString filename="20030603_01731_D_cosmics_E.root")
+void pixfirerate(TString filename="rawfile.root")
 {
     //
@@ -57 +57 @@
     // The tasklist is identified in the eventloop by its name
     //
+    MTaskList tlist;
     MParList  plist;
-    MTaskList tlist;
     plist.AddToList(&tlist);
 
@@ -73 +73 @@
     MReadMarsFile read("Events");
     read.DisableAutoScheme();
+    read.AddFile(filename);
+    tlist.AddToList(&read);
 
-    MHTrigLvl0 trigmap1(10.,"Above 10");
-    MHTrigLvl0 trigmap2(20.,"Above 20");
-    MHTrigLvl0 trigmap3(50.,"Above 50");
-    MHTrigLvl0 trigmap4(100.,"Above 100");
-    MHTrigLvl0 trigmap5(200.,"Above 200");
+    Double_t threshold[] = { 10, 20, 100, 200, -1 };
 
-    plist.AddToList(&trigmap1);
-    plist.AddToList(&trigmap2);
-    plist.AddToList(&trigmap3);
-    plist.AddToList(&trigmap4);
-    plist.AddToList(&trigmap5);
+    Int_t cnt = 0;
+    while (threshold[cnt]>0) cnt++;
 
-    MFillH fill1("Above 10","MRawEvtData");
-    MFillH fill2("Above 20","MRawEvtData");
-    MFillH fill3("Above 50","MRawEvtData");
-    MFillH fill4("Above 100","MRawEvtData");
-    MFillH fill5("Above 200","MRawEvtData");
+    for (int i=0; i<cnt; i++)
+    {
+        TString name = "Above ";
+        TString num;
+        num += threshold[i];
+        name += num.Strip(TString::kBoth);
+        TString title = "Firerate [%] of pixels with signal > ";
+        title += num.Strip(TString::kBoth);
 
-    read.AddFile(filename);
-
-    tlist.AddToList(&read);
-    tlist.AddToList(&fill1);
-    tlist.AddToList(&fill2);
-    tlist.AddToList(&fill3);
-    tlist.AddToList(&fill4);
-    tlist.AddToList(&fill5);
+        MHTriggerLvl0 *trigmap = new MHTriggerLvl0(threshold[i], name, title);
+        MFillH *fillh = new MFillH(trigmap, "MRawEvtData");
+        trigmap->SetBit(kCanDelete);
+        fillh->SetBit(kCanDelete);
+        plist.AddToList(trigmap);
+        tlist.AddToList(fillh);
+    }
 
     MEvtLoop evtloop;

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -117 +117 @@
 
     // Calculate quadratic sum of weights:
-    fSumWeights = 0;
+    Doubla_t sum = 0;
+
     fSumQuadWeights = 0;
     for (Int_t i=0; i<fWeight.GetSize(); i++)
-    {
-        fSumWeights += fWeight[i];
+        sum += fWeight[i];
+
+    for (Int_t i=0; i<fWeight.GetSize(); i++)
+    {
+        fWeight[i] /= sum;
         fSumQuadWeights += fWeight[i]*fWeight[i];
     }
-
-    fSumQuadWeights = sqrt(fSumQuadWeights);
 
     return kTRUE;
@@ -180 +182 @@
 
         const Double_t offset = fEnableFix ? ped.GetPedestal()-0.5 : ped.GetPedestal();
-        ped.Set(offset*fSumWeights, ped.GetPedestalRms()*fSumQuadWeights);
+        ped.Set(offset, ped.GetPedestalRms()*sqrt(fSumQuadWeights));
     }
 
@@ -195 +197 @@
     //fCerPhotEvt->InitSize(fRawEvt->GetNumPixels());
 
-    if (fIsMcFile)
-        ScalePedestals();
+//    if (fIsMcFile)
+//        ScalePedestals();
 
     MRawEvtPixelIter pixel(fRawEvt);

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.h

@@ -34 +34 @@
 
     TArrayF         fWeight;  // Weights for adding up the ADC slices
-    Float_t         fSumWeights;
     Float_t         fSumQuadWeights;
 

trunk/MagicSoft/Mars/mhist/MHCamera.h

@@ -93 +93 @@
     virtual void     SetCamContent(const MCamEvent &evt, Int_t type=0) { Reset(); AddCamContent(evt, type); }
     virtual void     SetCamContent(const TArrayD &evt, const TArrayC *used=NULL) { Reset(); AddCamContent(evt, used); }
-    virtual void     SetCamContent(const MHCamera &d, Int_t type=0) { Reset(); fEntries=d.fEntries-1; AddCamContent(d, type); }
+    virtual void     SetCamContent(const MHCamera &d, Int_t type=0) { Reset(); AddCamContent(d, type); fEntries=d.fEntries; }
     virtual void     CntCamContent(const MCamEvent &evt, Double_t threshold, Int_t type=0);
     virtual void     CntCamContent(const TArrayD &evt, Double_t threshold, Bool_t ispos=kTRUE);