Changeset 9625 for trunk/MagicSoft

Timestamp:

08/06/10 11:47:39 (14 years ago)

Author:

tbretz

Message:

Made baseline, baseline noise and gain accessible from the resources.

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (1 diff)
• ceres.rc (modified) (1 diff)
• msimcamera/MSimCamera.cc (modified) (3 diffs)
• msimcamera/MSimCamera.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -19 +19 @@
                                                  -*-*- END OF LINE -*-*-
 
+ 2010/08/06 Thomas Bretz
+
+   * msimcamera/MSimCamera.[h,cc]:
+     - added the possibility to set an overall baseline, baseline-noise
+       and gain.
+
+   * ceres.rc:
+     - added entries for the new values
+
+
+
  2010/07/28 Daniela Dorner
 

trunk/MagicSoft/Mars/NEWS

@@ -38 +38 @@
      has been implemented to set an artificial run-number:
         ---run-number=12345
+
+   * The baseline, the baseline noise and the gain (multiplicator to the
+     pulse) are now accessible from the outside. The new values are:
+        MSimCamera.DefaultOffset
+        MSimCamera.DefaultNoise
+        MSimCamera.DefaultGain
 
  ;star:

trunk/MagicSoft/Mars/ceres.rc

@@ -233 +233 @@
 #MPulseShape.Function.Xmax:   45
 
+# Old values
+# Baseline at 15 like in MAGIC
+# 1.5 bit noise for a gain of 64
+# This allows a maximum of 200phe/pix
+MSimCamera.DefaultOffset: 960
+MSimCamera.DefaultNoise:   96
+MSimCamera.DefaultGain:   256
+
+# New values
+#MSimCamera.DefaultOffset: 1000
+#MSimCamera.DefaultNoise:    30
+#MSimCamera.DefaultGain:    190
+
+
 # -------------------------------------------------------------------------
 # Setup an image cleaning on the pure gamma signal (without noise)

trunk/MagicSoft/Mars/msimcamera/MSimCamera.cc

@@ -74 +74 @@
 MSimCamera::MSimCamera(const char* name, const char *title)
     : fEvt(0), fStat(0), fRunHeader(0), fElectronicNoise(0), fGain(0),
-    fCamera(0), fMcEvt(0), fSpline(0), fBaselineGain(kFALSE)
+    fCamera(0), fMcEvt(0), fSpline(0), fBaselineGain(kFALSE),
+    fDefaultOffset(-1), fDefaultNoise(-1), fDefaultGain(-1)
+
 {
     fName  = name  ? name  : "MSimCamera";
@@ -171 +173 @@
     for (int i=0; i<fElectronicNoise->GetSize(); i++)
     {
-        // 64 -> Dynamic range 12 bit left
         MPedestalPix &ped = (*fElectronicNoise)[i];
-        ped.SetPedestal(15*64);     // Baseline at 15 like in MAGIC
-        ped.SetPedestalRms(1.5*64); //2.0); // 1.5 bit noise for a gain of 64
+        if (fDefaultOffset>0)
+            ped.SetPedestal(fDefaultOffset);
+        if (fDefaultNoise>0)
+            ped.SetPedestalRms(fDefaultNoise);
+
         ped.SetPedestalABoffset(0);
         ped.SetNumEvents(0);
 
-        // 256 scale from 8bit to 16bit
-        // 8 signal height of one phe
+
         MPedestalPix &gain = (*fGain)[i];
-        gain.SetPedestal(4*64);     // This allows a maximum of 200phe/pix
+        if (fDefaultGain>0)
+            gain.SetPedestal(fDefaultGain);
+
         gain.SetPedestalRms(0);
         gain.SetPedestalABoffset(0);
         gain.SetNumEvents(0);
     }
+
     return kTRUE;
 }
@@ -302 +308 @@
     }
 
+    if (IsEnvDefined(env, prefix, "DefaultOffset", print))
+    {
+        rc = kTRUE;
+        fDefaultOffset = GetEnvValue(env, prefix, "DefaultOffset", fDefaultOffset);
+    }
+    if (IsEnvDefined(env, prefix, "DefaultNoise", print))
+    {
+        rc = kTRUE;
+        fDefaultNoise = GetEnvValue(env, prefix, "DefaultNoise", fDefaultNoise);
+    }
+    if (IsEnvDefined(env, prefix, "DefaultGain", print))
+    {
+        rc = kTRUE;
+        fDefaultGain = GetEnvValue(env, prefix, "DefaultGain", fDefaultGain);
+    }
+
     return rc;
 }

trunk/MagicSoft/Mars/msimcamera/MSimCamera.h

@@ -32 +32 @@
     Bool_t fBaselineGain;  // Should the gain be applied to baseline and electronic noise?
 
+    Double_t fDefaultOffset;  // Default offset added to all channels
+    Double_t fDefaultNoise;   // Default noise (RMS) added to all samples
+    Double_t fDefaultGain;    // Default gain (multiplication factor to the given/used pulse shape)
+
     // MParContainer
     Int_t ReadEnv(const TEnv &env, TString prefix, Bool_t print);