Changeset 19922

Timestamp:

01/08/20 12:59:49 (5 years ago)

Author:

tbretz

Message:

New Pulse shape and corresponding gain as providedby Giang.

File:

• trunk/Mars/resmc/hawcseye/ceres.rc (modified) (4 diffs)

trunk/Mars/resmc/hawcseye/ceres.rc

@@ -16 +16 @@
 
 # ==========================================================================
-#############################################################################
+############################################################################
 # ==========================================================================
 #                                   Ceres
 # ==========================================================================
-#############################################################################
+############################################################################
 # ==========================================================================
 
@@ -187 +187 @@
 ConesAngularAcceptance.FileName:       resmc/hawcseye/angular_acceptance_cone.txt
 
-#FIXME: Calculate for out cones
+#FIXME: Calculate for our        cones
 #ConesTransmission.FileName:            resmc/fact/Transmittance_1439Cones_FACT_bearbeitet.txt
 ConesTransmission.FileName:            resmc/hawcseye/transmittance_cone.txt
@@ -299 +299 @@
 MSimCamera.DefaultOffset: -1850.0    # ADC counts
 MSimCamera.DefaultNoise:    2.8125   # ADC counts
-MSimCamera.DefaultGain:    22.553    # Conversion for the pulse to ADC counts
+MSimCamera.DefaultGain:    17.557    # Conversion for the pulse to ADC counts
 
 # Value for the fudgefactor in the calculation of the accoupling:
@@ -314 +314 @@
 # Attention: x in the function is given in slices, so if you change the sampling
 # frequency you have to change also this function
-PulseShape.Function.Name:  (1.1121*(1-1/(1+exp((0.5*x-4.0263)/1.063)))*exp(-(0.5*x-4.0263)/48.))
+PulseShape.Function.Name:  1.078*(1-1/(1+exp((0.5*x-2.4)/1.2)))*exp(-(0.5*x-2.4)/84)
+
+#PulseShape.Function.Name:  (1.1121*(1-1/(1+exp((0.5*x-4.0263)/1.063)))*exp(-(0.5*x-4.0263)/48.))
 #PulseShape.Function.Name:  (1.239*(1-1/(1+exp((0.5*x-2.851)/1.063)))*exp(-(0.5*x-2.851)/19.173))
 #PulseShape.Function.Name:  (1.239*(1-1/(1+exp((0.5*x-2.851)/1.5)))*exp(-(0.5*x-2.851)/80.3))