Changeset 1989 for trunk/MagicSoft/Mars

Timestamp:

04/23/03 16:28:05 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (5 diffs)
• mhist/MHCerPhotEvt.cc (modified) (8 diffs)
• mhist/MHCerPhotEvt.h (modified) (2 diffs)
• mhistmc/MHMcCT1CollectionArea.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -1 +1 @@
                                                  -*-*- END OF LINE -*-*-
+
+ 2003/04/23: Thomas Bretz
+
+    * mhist/MHCerPhotEvt.[h,cc]:
+      - updated dox
+
+
 
  2003/04/23: Abelardo Moralejo
@@ -18 +25 @@
       - adapted to changes above.
 
+    * mmc/MMcRunHeader.[hxx,cxx], mmc/MMCEvt.[hxx,cxx]
+      - added comment in class description about the definition of
+        the azimuth angle phi in the MC classes.
+
+
+
  2003/04/23: Antonio Stamerra
 
@@ -27 +40 @@
       - modified accordingly (added MFEnergySlope)
 
- 2003/04/23: Abelardo Moralejo
-
-    * mmc/MMcRunHeader.[hxx,cxx], mmc/MMCEvt.[hxx,cxx]
-      - added comment in class description about the definition of
-        the azimuth angle phi in the MC classes.
+
 
  2003/04/22: Abelardo Moralejo
@@ -46 +55 @@
     * mfilter/MFCT1SelFinal.[h,cc]
       - added the possibility to cut also in Dist.
+
+
 
  2003/04/22: Thomas Bretz
@@ -75 +86 @@
       - added mhistmc
 
-
-
- 2003/04/22: Thomas Bretz
- 
+    * mmain/MStatusDisplay.cc:
+      - SetNoContextMenu(Bool_t flag) removed default argument
+
+    * mmain/Makefile:
+      - added -I../mhistmc
+
    * mhist/MWeight.[h,cc]:
      - added

trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.cc

@@ -63 +63 @@
 // --------------------------------------------------------------------------
 //
-// Setup four histograms for Width, Length
+// Initialize the name and title of the task.
+// Resets the sum histogram
 //
 MHCerPhotEvt::MHCerPhotEvt(const char *name, const char *title)
@@ -77 +78 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Delete the corresponding camera display if available
+//
 MHCerPhotEvt::~MHCerPhotEvt()
 {
@@ -85 +90 @@
 // --------------------------------------------------------------------------
 //
-// Setup the Binning for the histograms automatically if the correct
-// instances of MBinning (with the names 'BinningWidth' and 'BinningLength')
-// are found in the parameter list
-// Use this function if you want to set the conversion factor which
-// is used to convert the mm-scale in the camera plain into the deg-scale
-// used for histogram presentations. The conversion factor is part of
-// the camera geometry. Please create a corresponding MGeomCam container.
+// Get the event (MCerPhotEvt) the histogram might be filled with. If
+// it is not given, it is assumed, that it is filled with the argument
+// of the Fill function.
+// Looks for the camera geometry MGeomCam and resets the sum histogram.
 //
 Bool_t MHCerPhotEvt::SetupFill(const MParList *plist)
@@ -110 +112 @@
 // --------------------------------------------------------------------------
 //
-// Fill the histograms with data from a MHillas-Container.
-// Be careful: Only call this with an object of type MHillas
-//
-Bool_t MHCerPhotEvt::Fill(const MParContainer *par)
+// Fill the histograms with data from a MCerPhotEvt-Container.
+//
+Bool_t MHCerPhotEvt::Fill(const MParContainer *par, Double_t w)
 {
     const MCerPhotEvt *evt = par ? (MCerPhotEvt*)par : fEvt;
@@ -143 +144 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Scale the sum container with the number of entries
+//
 Bool_t MHCerPhotEvt::Finalize()
 {
@@ -149 +154 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Draw clone
+//
 TObject *MHCerPhotEvt::DrawClone(Option_t *opt) const
 {
@@ -154 +163 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// Draw the present 'fill status'
+//
 void MHCerPhotEvt::Draw(Option_t *)
 {
@@ -168 +181 @@
 }
 
+// --------------------------------------------------------------------------
+//
+// If a camera display is not yet assigned, assign a new one.
+//
 void MHCerPhotEvt::Paint(Option_t *option="")
 {

trunk/MagicSoft/Mars/mhist/MHCerPhotEvt.h

@@ -17 +17 @@
 {
 private:
-    MCerPhotEvt  fSum;
-    Int_t        fEntries;
-    MCerPhotEvt *fEvt;   //!
-    MGeomCam    *fCam; 
-    MCamDisplay *fDispl; //!
+    MCerPhotEvt  fSum;      // storing the sum
+    Int_t        fEntries;  // number of entries in the histogram
+    MGeomCam    *fCam;      // the present geometry
+    MCerPhotEvt *fEvt;      //! the current event
+    MCamDisplay *fDispl;    //! the camera display
 
 public:
@@ -27 +27 @@
     ~MHCerPhotEvt();
 
-    //    TObject *Clone(const char *newname="") const;
-
     void Clear();
 
     Bool_t SetupFill(const MParList *pList);
-    Bool_t Fill(const MParContainer *par);
+    Bool_t Fill(const MParContainer *par, Double_t w=1);
     Bool_t Finalize();
 

trunk/MagicSoft/Mars/mhistmc/MHMcCT1CollectionArea.cc

@@ -116 +116 @@
     if (!binsenergy || !binstheta)
     {
-        *fLog << err << dbginf << "At least one MBinning not found... aborting."
- << endl;
+        *fLog << err << dbginf << "At least one MBinning not found... aborting.";
+        *fLog << endl;
         return kFALSE;
     }