Changeset 5410 for trunk/MagicSoft

Timestamp:

11/16/04 12:12:51 (20 years ago)

Author:

moralejo

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/Changelog (modified) (1 diff)
• include-Classes/MMcFormat/MMcFadcHeader.hxx (modified) (4 diffs)
• include-Classes/MMcFormat/MMcTrigHeader.hxx (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -25 +25 @@
    * mmc/MMcEvt.hxx
      - Added comment regarding change in version 4.
+
+   * mmc/MMcFadcHeader.hxx
+     - Added data member fNoiseGainFluctuations. Updated class version
+       to 6
+
+   * mmc/MMcTrigHeader.hxx
+     - Added data members fGainFluctuations and fNoiseGainFluctuations.
+       Will contain same values as the corresponding members in the
+       MMcFadcHeader of MC camera files. We just put them in both 
+       headers because the fluctuations affect both the trigger 
+       signal and the FADC signal.
+
 
  2004/11/16: Markus Gaug

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

@@ -7 +7 @@
 
 #include "MFadcDefine.h"
+
+//
+// Version 5:
+//   Added member fGainFluctuations
+//
+// Version 6:
+//   Added member fNoiseGainFluctuations
+//
 
 class MMcFadcHeader : public MParContainer{
@@ -53 +61 @@
 
   Bool_t  fGainFluctuations;
-  // kTRUE if PMT gain fluctuations were simulated (=> default in camera simulation)
+  // kTRUE if PMT gain fluctuations were simulated for the signal 
+  // (=> default in camera simulation)
+
+  Bool_t  fNoiseGainFluctuations;
+  // kTRUE if PMT gain fluctuations were simulated for the NSB noise 
+  // (=> default in StarResponse program)
 
 
@@ -105 +118 @@
   
   void SetGainFluctuations(Bool_t x) { fGainFluctuations = x; }
+  void SetNoiseGainFluctuations(Bool_t x) { fNoiseGainFluctuations = x; }
 
   Float_t GetPedestal(UInt_t i) const    { return fPedesMean[i]; }
@@ -117 +131 @@
   UInt_t GetNumPixel() const { return MFADC_CHANNELS; }
 
-  ClassDef(MMcFadcHeader, 5)  //Stores Montecarlo Information describing the FADC behaviour
+  ClassDef(MMcFadcHeader, 6)  //Stores Montecarlo Information describing the FADC behaviour
 
 };

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

@@ -8 +8 @@
 #include "MTriggerDefine.h"
 #include "Mdefine.h"
+
+//
+// Version 4
+//   Added data members fGainFluctuations and fNoiseGainFluctuations
+//
 
 class MMcTrigHeader : public MParContainer{
@@ -31 +36 @@
                             // the amplitude of the single phe response 
                             // for the trigger
+
+  Bool_t  fGainFluctuations;
+  // kTRUE if PMT gain fluctuations were simulated for the signal 
+  // (=> default in camera simulation)
+
+  Bool_t  fNoiseGainFluctuations;
+  // kTRUE if PMT gain fluctuations were simulated for the NSB noise 
+  // (=> default in StarResponse program)
+
 
  public:
@@ -90 +104 @@
   }
 
-
+  void SetGainFluctuations(Bool_t x) { fGainFluctuations = x; }
+  void SetNoiseGainFluctuations(Bool_t x) { fNoiseGainFluctuations = x; }
 
   Short_t GetMultiplicity() { return fMultiplicity; }
@@ -111 +126 @@
 
 
-  ClassDef(MMcTrigHeader, 3)  //Stores Montecarlo Information which describes the used trigger
+  ClassDef(MMcTrigHeader, 4)  //Stores Montecarlo Information which describes the used trigger
 
 };
 
 #endif
-