Changeset 17210 for trunk

Timestamp:

10/11/13 14:55:29 (11 years ago)

Author:

ftemme

Message:

changed the values in the ceres.rc for the 12 bit ADC

Location:

trunk/Mars

Files:

• ceres.rc (modified) (2 diffs)
• mraw/MRawRunHeader.cc (modified) (1 diff)

trunk/Mars/ceres.rc

@@ -164 +164 @@
 MSimTrigger.FileNameRouteAC: resmc/fact/fact-trigger-sum.txt
 
-# DiscriminatorThreshold is 9*offset(3580)+21*gain(358)=39738
-MSimTrigger.DiscriminatorThreshold: 39738
+# DiscriminatorThreshold is 9*offset(-1850)+21*gain(22.375)=16180.125
+MSimTrigger.DiscriminatorThreshold: -16180.125
 
 # Every Pixel(!) should see the same signal independant of its size
@@ -194 +194 @@
 MRawRunHeader.FadcResolution:      12
 
-MSimCamera.DefaultOffset: 3580
-MSimCamera.DefaultNoise:    45
-MSimCamera.DefaultGain:    358
+MSimCamera.DefaultOffset: -1850.0
+MSimCamera.DefaultNoise:    2.8125
+MSimCamera.DefaultGain:    22.375
 
 # Value for the fudgefactor in the calculation of the accoupling:
 MSimCamera.fACFudgeFactor: 0.3367
+MSimCamera.fACTimeConstant: 20
 
 #MSimReadout.fConversionFactor: 1

trunk/Mars/mraw/MRawRunHeader.cc

@@ -1413 +1413 @@
         fSamplingFrequency = GetEnvValue(env, prefix, "SamplingFrequency", fSamplingFrequency);
     }
+    
+    if (IsEnvDefined(env, prefix, "IsSigned", print))
+    {
+        rc = kTRUE;
+        fIsSigned = GetEnvValue(env, prefix, "IsSigned", fIsSigned);
+    }
 
     if (IsEnvDefined(env, prefix, "FadcResolution", print))