Changeset 7634 for trunk/MagicSoft

Timestamp:

04/11/06 16:34:48 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (1 diff)
• Mars/mjobs/MJSpectrum.cc (modified) (2 diffs)
• include-Classes/MMcFormat/MFadcDefine.h (modified) (1 diff)
• include-Classes/MMcFormat/MMcFadcHeader.hxx (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -36 +36 @@
      - improve speed of optimization by switching of timing and
        reset in eventloop
+
+   * mmc/MFadcHeader.h:
+     - changed MFADC_CHANNELS from 3500 to 3800 according to Abelardo
+
+   * mmc/MMcFadcHeader.hxx:
+     - increaded version number from 7 to 8
 
 

trunk/MagicSoft/Mars/mjobs/MJSpectrum.cc

@@ -1194 +1194 @@
 
     // Calculate and display spectrum (N/TeVsm^2 at 1TeV)
-    TArrayD res(DisplaySpectrum(area, excess, hest, ontime));
+    TArrayD res(DisplaySpectrum(area1, excess, hest, ontime));
 
     // Spectrum fitted (convert res[1] from TeV to GeV)
@@ -1204 +1204 @@
     // scale with effective collection area to get the event rate (N/s)
     // scale with the effective observation time to absolute observed events
-    n *= area.GetCollectionAreaAbs()*ontime; // N
+    n *= area1.GetCollectionAreaAbs()*ontime; // N
 
     // Now calculate the scale factor from the number of events
     // produced and the number of events which should have been
     // observed with our telescope in the time ontime
-    const Double_t scale = n/area.GetEntries();
+    const Double_t scale = n/area1.GetEntries();
 
     // Print normalization constant

trunk/MagicSoft/include-Classes/MMcFormat/MFadcDefine.h

@@ -28 +28 @@
 // -->  The maximum number of FADC channels
 //      Most likely it will be always equal to CAMERA_PIXELS 
-#define MFADC_CHANNELS  3500
+#define MFADC_CHANNELS  3800
 //
 //  --> Ratio of high to low gain:

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

@@ -139 +139 @@
   void   DrawPixelContent(Int_t num) const { }
 
-  ClassDef(MMcFadcHeader, 7)  //Stores Montecarlo Information describing the FADC behaviour
-
+  ClassDef(MMcFadcHeader, 8)  //Stores Montecarlo Information describing the FADC behaviour
 };