Changeset 2244

Timestamp:

06/27/03 14:22:16 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (5 diffs)
• macros/sumevents.C (modified) (2 diffs)
• macros/sumpedestals.C (modified) (3 diffs)
• manalysis/MPedestalCam.cc (modified) (1 diff)
• mhist/HistLinkDef.h (modified) (1 diff)
• mhist/MHCamEvent.cc (modified) (1 diff)
• mhist/MHCamera.h (modified) (1 diff)
• mhist/MHPixVsTime.cc (added)
• mhist/MHPixVsTime.h (added)
• mhist/Makefile (modified) (1 diff)
• mraw/MRawEvtData.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/06/27: Thomas Bretz
+ 
+   * macros/sumevents.C, macros/sumpedestals.C:
+     - some small changes
+     
+   * manalysis/MPedestalCam.cc:
+     - return pixel as used if the value is valid (>=0)
+     
+   * mhist/HistLinkDef.h, mhist/Makefile:
+     - MHPixVsTime added (Name is preliminary)
+
+   * mhist/MHCamEvent.cc:
+     - removed including MGeomPix
+     
+   * mhist/MHCamera.h:
+     - in SetCamContent copy also number of entries
+     
+   * mraw/MRawEvtData.cc:
+     - fixed to support correct pixel numbering
+     
+   * mhist/MHPixVsTime.[h,cc]:
+     - added
+
+
 
  2003/06/27: Abelardo Moralejo
@@ -10 +35 @@
   * macros/CT1collectionArea.C, CT1EgyEst.C
     - Changed theta binnings to adapt them to the new standard.
+
+
 
  2003/06/26: Abelardo Moralejo
@@ -20 +47 @@
       them to run on files with hadronness info.
 
- 2003/06/26: Abelardo Moralejo
-
   * mhistmc/MHMcEnergyMigration.cc
     - exchanged axes of E_est and E_MC in the 3-d histograms.
@@ -31 +56 @@
      - adapted to new function names in MPedestalPix (please Thomas
        check these, I had to do it to make Mars compile)
+
+
 
  2003/06/26: Thomas Bretz
@@ -109 +136 @@
    * mmontecarlo/MMcCollectionAreaCalc.cc:
      - minor change
-     
-
-  
+
+   * macros/sumevents.C, macros/sumpedestals.C:
+     - added
+
+   * mhist/MHCamEvent.cc:
+     - do not scale with 100
+
+   * mhist/MHCamera.cc:
+     - fixed displaying number of entries when used 
+       SetCamContent(MHCamera&)
+
 
 

trunk/MagicSoft/Mars/macros/sumevents.C

@@ -76 +76 @@
     MHCamera *disp0 = h.GetHistByName();
     MHCamera *disp1 = new MHCamera(geom, "MCerPhotEvt;avg", "Cerenkov Photons Avarage");
-    MHCamera *disp2 = new MHCamera(geom, "MCerPhotEvt;rms", "Cerenkov Photons RMS");
-    MHCamera *disp3 = new MHCamera(geom, "MCerPhotEvt;rel", "Cerenkov Photons RMS/VAL");
+    MHCamera *disp2 = new MHCamera(geom, "MCerPhotEvt;err", "Cerenkov Photons Error");
+    MHCamera *disp3 = new MHCamera(geom, "MCerPhotEvt;rel", "Cerenkov Photons ERR/VAL");
     disp1->SetBit(kCanDelete);
     disp2->SetBit(kCanDelete);
@@ -88 +88 @@
     disp2->SetStats(kFALSE);
     disp3->SetStats(kFALSE);
+
+    disp1->SetYTitle("a.u.");
+    disp2->SetYTitle("err");
+    disp3->SetYTitle("rel.err [%]");
 
     c->cd(4);

trunk/MagicSoft/Mars/macros/sumpedestals.C

@@ -76 +76 @@
     MHCamera *disp0 = h.GetHistByName();
     MHCamera *disp1 = new MHCamera(geom, "MPedestalCam;avg", "Pedestals Avarage");
-    MHCamera *disp2 = new MHCamera(geom, "MPedestalCam;rms", "Pedestals Avarage RMS");
-    MHCamera *disp3 = new MHCamera(geom, "MPedestalCam;rel", "Pedestals Avarage RMS/VAL");
+    MHCamera *disp2 = new MHCamera(geom, "MPedestalCam;rms", "Pedestals Avarage Error");
+    MHCamera *disp3 = new MHCamera(geom, "MPedestalCam;rel", "Pedestals Avarage ERR/VAL");
     disp1->SetBit(kCanDelete);
     disp2->SetBit(kCanDelete);
@@ -88 +88 @@
     disp2->SetStats(kFALSE);
     disp3->SetStats(kFALSE);
+
+    disp1->SetXTitle("a.u.");
+    disp2->SetXTitle("err");
+    disp3->SetXTitle("rel.err [%]");
 
     c->cd(4);
@@ -114 +118 @@
 
     c->cd(2);
-    gPad->SetLogy();
     disp2->Draw("hist");
 
     c->cd(3);
-    gPad->SetLogy();
     disp3->Draw("hist");
 

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -192 +192 @@
         break;
     }
-    return kTRUE;
+    return val>=0;
 }

trunk/MagicSoft/Mars/mhist/HistLinkDef.h

@@ -44 +44 @@
 
 #pragma link C++ class MHCamera+;
-//#pragma link C++ class MHCurrents+;
-//#pragma link C++ class MHOnSubtraction+;
+#pragma link C++ class MHPixVsTime+;
 
 #endif

trunk/MagicSoft/Mars/mhist/MHCamEvent.cc

@@ -43 +43 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
 
 ClassImp(MHCamEvent);

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(), AddCamContent(d, type); }
+    virtual void     SetCamContent(const MHCamera &d, Int_t type=0) { Reset(); fEntries=d.fEntries-1; AddCamContent(d, type); }
     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);

trunk/MagicSoft/Mars/mhist/Makefile

@@ -37 +37 @@
            MH3.cc \
            MHCamEvent.cc \
+           MHPixVsTime.cc \
            MHMatrix.cc \
            MHFadcPix.cc \

trunk/MagicSoft/Mars/mraw/MRawEvtData.cc

@@ -447 +447 @@
 
         // -1 converts the hardware pixel Id into the software pixel index
-        const Int_t npix = fRunHeader->GetPixAssignment(ipos);
+        const Int_t npix = (Int_t)fRunHeader->GetPixAssignment(ipos)-1;
 
         // Check whether the pixel is connected or not
-        if (npix==0)
+        if (npix<0)
             continue;