Changeset 9375 for trunk

Timestamp:

03/02/09 15:17:04 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mhflux/MHCollectionArea.cc (modified) (1 diff)
• msimcamera/MSimRandomPhotons.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -40 +40 @@
      mcorsika/MCorsikaEvtHeader.cc, mfilter/MFSoftwareTrigger.cc,
      mgeom/MGeomCam.cc, mhcalib/MHCalibrationCam.cc,
-     mhcalib/MHCalibrationChargeCam.cc, mhcalib/MHCalibrationPulseTimeCam.cc,
+     mhcalib/MHCalibrationChargeCam.cc,  msignal/MSignalCam.cc,
+     mhcalib/MHCalibrationPulseTimeCam.cc,
      mhcalib/MHCalibrationRelTimeCam.cc, mhft/MHexagonalFTCalc.cc,
      mhist/MHCamera.cc, mimage/MHillas.cc, mimage/MNewImagePar.cc,
-     mjobs/MJCut.cc, mjobs/MJSimulation.cc, mpedestal/MExtractPedestal.cc,
-     mpedestal/MPedPhotCam.cc, mpedestal/MPedestalCam.cc,
-     mpointing/MPointingPos.h, msignal/MSignalCam.cc,
-     msimcamera/MSimGeomCam.cc:
+     mjobs/MJCut.cc, mjobs/MJSimulation.cc, mpedestal/MPedPhotCam.cc, 
+     mpedestal/MExtractPedestal.cc, mpointing/MPointingPos.h, 
+     mpedestal/MPedestalCam.cc, msimcamera/MSimGeomCam.cc, 
+     msimcamera/MSimRandomPhotons.cc:
      - replaced MGeomPix by MGeom
 
@@ -52 +53 @@
      - added BinningDist
      - converted Muon cuts from mm to deg
+
+   * mhflux/MHCollectionArea.cc:
+     - fixed a problem that a plot disappeared in old files
+
+   * mmuon/MMuonSearchPar.cc:
+     - switched off the check in Paint (this works only for MAGIC :( )
 
 

trunk/MagicSoft/Mars/mhflux/MHCollectionArea.cc

@@ -286 +286 @@
 void MHCollectionArea::Paint(Option_t *option)
 {
-    if (TString(option)=="paint4" && fMcAreaRadius>0)
-    {
+    // This is a workaround to support also older files
+    if (TString(option)=="paint3")
+        return;
+
+    if (TString(option)=="paint4")
+    {
+        if (fMcAreaRadius<=0)
+            return;
+
         const TString txt = MString::Format("r_{max}=%.0fm --> A_{max}=%.0fm^{2}",
                                             fMcAreaRadius, GetCollectionAreaAbs());

trunk/MagicSoft/Mars/msimcamera/MSimRandomPhotons.cc

@@ -57 +57 @@
 
 #include "MGeomCam.h"
-#include "MGeomPix.h"
+#include "MGeom.h"
 
 #include "MPhotonEvent.h"
@@ -212 +212 @@
 // Read the parameters from the resource file.
 //
-//    FrequencyFixed: 40
-//    FrequencyNSB:   40
+//    FrequencyFixed: 0.040
+//    FrequencyNSB:   0.040
 //
 // The frequency is given in units fitting the units of the time.