Changeset 2273 for trunk/MagicSoft/Mars

Timestamp:

07/12/03 16:44:56 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• macros/CT1collarea.C (modified) (8 diffs)
• mbase/MArgs.h (modified) (1 diff)
• mhistmc/MHMcCT1CollectionArea.cc (modified) (10 diffs)
• mhistmc/MHMcCT1CollectionArea.h (modified) (3 diffs)
• mraw/MRawRunHeader.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/07/12: Thomas Bretz
+ 
+   * mhistmc/MHMcCT1CollectionArea.[h,cc]:
+     - made the enum as FillType_t a public member of the class
+
+   * macros/CT1collarea.C
+     - Updated accordingly. Can somebody please check whether it
+       still works.
+ 
+   * mbase/MArgs.h:
+     - added some comment
+     
+   * mraw/MRawRunHeader.cc:
+     - added an 'inf' to the log-stream
+
+
 
  2003/07/08: Abelardo Moralejo
@@ -9 +26 @@
        distribution of the shower.
 
+
+
  2003/07/06: Abelardo Moralejo
 
@@ -20 +39 @@
      - Added example on how to use the new function 
        MHMcCT1CollectionArea::SetEaxis
+
+
 
  2003/07/06: Thomas Bretz

trunk/MagicSoft/Mars/macros/CT1collarea.C

@@ -24 +24 @@
 \* ======================================================================== */
 
-#include "/home/magic/Mars/mhistmc/MHMcCT1CollectionArea.h"
-
 void CT1collarea(TString filename="MC_SC4.root", TString outname="")
 { 
@@ -45 +43 @@
     reader.DisableAutoScheme();
 
-    MHMcCT1CollectionArea* collarea = new MHMcCT1CollectionArea();
+    MHMcCT1CollectionArea collarea;
 
     MBinning binsx("BinningE");
@@ -54 +52 @@
     xed.Set(15,xedge);
     binsx.SetEdges(xed);
-    collarea->SetEaxis(kLog10Energy);
+    collarea.SetEaxis(MHMcCollectionArea::kLog10);
     */
 
@@ -64 +62 @@
     //
     binsx.SetEdgesLog(14,300,1.e5);
-    collarea->SetEaxis(kEnergy);
+    collarea.SetEaxis(MHMcCT1CollectionArea::kLinear);
 
 
@@ -73 +71 @@
     binsy.SetEdges(yed);
 
-    parlist.AddToList(collarea);
+    parlist.AddToList(&collarea);
     parlist.AddToList(&binsx);
     parlist.AddToList(&binsy);
@@ -103 +101 @@
     tasklist.PrintStatistics();
 
-    collarea->CalcEfficiency();
+    collarea.CalcEfficiency();
 
     //
@@ -109 +107 @@
     // filled and can be displayed
     //
-    collarea->DrawClone();
+    collarea.DrawClone();
 
     //
@@ -119 +117 @@
 
     TFile f(outname,"recreate");
-    collarea->GetHist()->Write();
-    collarea->GetHAll()->Write();
-    collarea->GetHSel()->Write();
-    f.Close();
+    collarea.GetHist()->Write();
+    collarea.GetHAll()->Write();
+    collarea.GetHSel()->Write();
 }
 

trunk/MagicSoft/Mars/mbase/MArgs.h

@@ -35 +35 @@
     void Print(const Option_t *o="") const;
 
+    // FIXME: Add max, min option
+    // FIXME: Add default option
+
     Int_t    GetInt(const TString name) const;
     Double_t GetFloat(const TString name) const;

trunk/MagicSoft/Mars/mhistmc/MHMcCT1CollectionArea.cc

@@ -52 +52 @@
 //   - collection area (result)
 //
-MHMcCT1CollectionArea::MHMcCT1CollectionArea(const char *name, const char *title)
+MHMcCT1CollectionArea::MHMcCT1CollectionArea(const char *name, const char *title) :
+    fEaxis(kLog10)
 { 
   //
@@ -66 +67 @@
   fTitle = title ? title : "Collection Area vs. log10 Energy";
 
-  fEaxis = kLog10Energy;
-
   fHistAll = new TH2D;
   fHistSel = new TH2D;
@@ -84 +83 @@
   fHistCol->SetDirectory(NULL);
 
-  fHistAll->SetXTitle("log10 E [GeV]");
-  fHistAll->SetYTitle("theta [deg]");
-  fHistAll->SetZTitle("N");
-
-  fHistSel->SetXTitle("log10 E [GeV]");
-  fHistSel->SetYTitle("theta [deg]");
-  fHistSel->SetZTitle("N");
-
-  fHistCol->SetXTitle("log10 E [GeV]");
+  fHistAll->SetXTitle("log10(E [GeV])");
+  fHistAll->SetYTitle("\\Theta [\\circ]");
+  fHistAll->SetZTitle("Counts");
+
+  fHistSel->SetXTitle("log10(E [GeV])");
+  fHistSel->SetYTitle("\\Theta [\\circ]");
+  fHistSel->SetZTitle("Counts");
+
+  fHistCol->SetXTitle("log10(E [GeV])");
   fHistCol->SetYTitle("theta [deg]");
   fHistCol->SetZTitle("A [m^{2}]");
@@ -133 +132 @@
     fHistCol->Sumw2();
 
-    if (fEaxis == kEnergy)
-      {
-        fTitle = "Collection Area vs. Energy";
-        fHistCol->SetTitle(fTitle);
-        fHistAll->SetTitle("All showers - Theta vs Energy distribution");
-        fHistSel->SetTitle("Selected showers - Theta vs Energy distribution");
-        fHistCol->SetXTitle("E [GeV]");
-        fHistAll->SetXTitle("E [GeV]");
-        fHistSel->SetXTitle("E [GeV]");
-      }
+    if (fEaxis == kLinear)
+    {
+        fTitle = "Collection Area vs. Energy";
+        fHistCol->SetTitle(fTitle);
+        fHistAll->SetTitle("All showers - Theta vs Energy distribution");
+        fHistSel->SetTitle("Selected showers - Theta vs Energy distribution");
+        fHistCol->SetXTitle("E [GeV]");
+        fHistAll->SetXTitle("E [GeV]");
+        fHistSel->SetXTitle("E [GeV]");
+    }
 
     return kTRUE;
@@ -156 +155 @@
   MMcEvt &mcevt = *(MMcEvt*)par;
 
-  if (fEaxis == kLog10Energy)
-    fHistSel->Fill(log10(mcevt.GetEnergy()), kRad2Deg*mcevt.GetTelescopeTheta(), w);
-  else
-    fHistSel->Fill(mcevt.GetEnergy(), kRad2Deg*mcevt.GetTelescopeTheta(), w);
+  const Double_t E = fEaxis==kLinear ? mcevt.GetEnergy() : log10(mcevt.GetEnergy());
+
+  fHistSel->Fill(E, kRad2Deg*mcevt.GetTelescopeTheta(), w);
 
   return kTRUE;
@@ -211 +209 @@
 
   c.cd(1);
-  if (fEaxis == kEnergy)
+  if (fEaxis == kLinear)
     gPad->SetLogx();
   fHistCol->SetDirectory(NULL);
@@ -217 +215 @@
 
   c.cd(2);
-  if (fEaxis == kEnergy)
+  if (fEaxis == kLinear)
     gPad->SetLogx();
   fHistSel->SetDirectory(NULL);
@@ -223 +221 @@
 
   c.cd(3);
-  if (fEaxis == kEnergy)
+  if (fEaxis == kLinear)
     gPad->SetLogx();
   fHistAll->SetDirectory(NULL);
@@ -462 +460 @@
           Float_t e2;
 
-          if (fEaxis == kLog10Energy)
+          if (fEaxis == kLog10)
             {
               e1 = pow(10.,fHistAll->GetXaxis()->GetBinLowEdge(i));
@@ -547 +545 @@
           //
 
-          Float_t area;
+          Float_t area = dr;
 
           if (theta < 50)
-            area = dr * cos(theta*TMath::Pi()/180.);
-          else
-            area = dr;
+            area *= cos(theta*TMath::Pi()/180.);
 
           // Above 50 degrees MC was generated with Corsika 6.xx, and the cores

trunk/MagicSoft/Mars/mhistmc/MHMcCT1CollectionArea.h

@@ -6 +6 @@
 #endif
 
-enum {
-  kLog10Energy,
-  kEnergy
-};
-
 class TH2D;
 
 class MHMcCT1CollectionArea : public MH
 {
+public:
+    enum FillType_t {
+        kLog10,
+        kLinear
+    };
+
 private:
     TH2D *fHistAll; //  all simulated showers
@@ -20 +21 @@
     TH2D *fHistCol; //  the collection area
 
-    Byte_t  fEaxis;
+    FillType_t fEaxis;
 
 public:
@@ -32 +33 @@
     void DrawSel(Option_t *option="");
 
-    void SetEaxis(Byte_t x) { fEaxis = x; }
+    void SetEaxis(FillType_t x) { fEaxis = x; }
 
     const TH2D *GetHist() const { return fHistCol; }

trunk/MagicSoft/Mars/mraw/MRawRunHeader.cc

@@ -155 +155 @@
     *fLog << "Evt Counter:  " << fNumEvents << endl;
 
-    *fLog << hex;
+    *fLog << inf << hex;
     for (int i=0; i<GetNumPixel(); i++)
         *fLog << setfill('0') << setw(3) << (*fPixAssignment)[i] << " ";