Changeset 1890

Timestamp:

04/02/03 20:46:38 (21 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (1 diff)
• Mars/mmontecarlo/MMcTriggerRateCalc.cc (modified) (3 diffs)
• include-Classes/MMcFormat/MMcTrigHeader.hxx (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -2 +2 @@
 
  2003/04/02: Abelardo Moralejo
+
+   * mmc/MMcTrigHeader.hxx
+     - added threshold>0 check in the calculation of 
+       GetMeanThreshold
+
+   * mmontecarlo/MMcTriggerRateCalc.cc
+     - The check of the MC spectral index value is now done by 
+       comparing integers instead of real numbers.
+     - Found out with GREAT surprise that the graphical output
+       has been completely commented out by someone(?) because it 
+       produced a memory leak. Also the function comment did not 
+       match the rules (my fault; is it correct now?) This commenting 
+       out has not been logged to this file, as far as I can see. This
+       is rather unkind, I thought that when somebody finds some bug or
+       messy code, he should either correct and commit it (and log the 
+       change here) and/or inform the author of the mistake to correct 
+       it. Please try to do so in the future instead of simply 
+       commenting out useful code!
 
    * mdata/MDataValue.h

trunk/MagicSoft/Mars/mmontecarlo/MMcTriggerRateCalc.cc

@@ -323 +323 @@
         {
         case kPROTON:
-          if (fMcCorRunHeader->GetSlopeSpec() != -2.75)
+          if (floor(-100*fMcCorRunHeader->GetSlopeSpec()+0.5) != 275)
             {
                 *fLog << err << dbginf << "Spectrum slope as read from input file (";
@@ -333 +333 @@
           break;
         case kHELIUM:
-          if (fMcCorRunHeader->GetSlopeSpec() != -2.62)
+          if (floor(-100*fMcCorRunHeader->GetSlopeSpec()+0.5) != 262)
             {
                 *fLog << err << dbginf << "Spectrum slope as read from input file (";
                 *fLog << fMcCorRunHeader->GetSlopeSpec() << ") does not match the expected ";
-                *fLog << "one (-2.75) for Helium" << endl << "... aborting." << endl;
+                *fLog << "one (-2.62) for Helium" << endl << "... aborting." << endl;
                 return kFALSE;
             }
@@ -358 +358 @@
 }
 
-
+// --------------------------------------------------------------------------
+//
 // Draw rate as a funtion of discriminator threshold.
-
+//
 void MMcTriggerRateCalc::Draw()
 {

trunk/MagicSoft/include-Classes/MMcFormat/MMcTrigHeader.hxx

@@ -100 +100 @@
     for(i=0;i<CAMERA_PIXELS;i++)
     {
-      if (fThreshold[i] < 1.e6)
+      if (fThreshold[i] < 1.e6 && fThreshold[i] > 0.)
       {
         sum += fThreshold[i];