Changeset 19922 for trunk/Mars


Ignore:
Timestamp:
01/08/20 12:59:49 (5 years ago)
Author:
tbretz
Message:
New Pulse shape and corresponding gain as providedby Giang.
File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Mars/resmc/hawcseye/ceres.rc

    r19891 r19922  
    1616
    1717# ==========================================================================
    18 #############################################################################
     18############################################################################
    1919# ==========================================================================
    2020#                                   Ceres
    2121# ==========================================================================
    22 #############################################################################
     22############################################################################
    2323# ==========================================================================
    2424
    … …  
    187187ConesAngularAcceptance.FileName:       resmc/hawcseye/angular_acceptance_cone.txt
    188188
    189 #FIXME: Calculate for out cones
     189#FIXME: Calculate for our        cones
    190190#ConesTransmission.FileName:            resmc/fact/Transmittance_1439Cones_FACT_bearbeitet.txt
    191191ConesTransmission.FileName:            resmc/hawcseye/transmittance_cone.txt
    … …  
    299299MSimCamera.DefaultOffset: -1850.0    # ADC counts
    300300MSimCamera.DefaultNoise:    2.8125   # ADC counts
    301 MSimCamera.DefaultGain:    22.553    # Conversion for the pulse to ADC counts
     301MSimCamera.DefaultGain:    17.557    # Conversion for the pulse to ADC counts
    302302
    303303# Value for the fudgefactor in the calculation of the accoupling:
    … …  
    314314# Attention: x in the function is given in slices, so if you change the sampling
    315315# frequency you have to change also this function
    316 PulseShape.Function.Name:  (1.1121*(1-1/(1+exp((0.5*x-4.0263)/1.063)))*exp(-(0.5*x-4.0263)/48.))
     316PulseShape.Function.Name:  1.078*(1-1/(1+exp((0.5*x-2.4)/1.2)))*exp(-(0.5*x-2.4)/84)
     317
     318#PulseShape.Function.Name:  (1.1121*(1-1/(1+exp((0.5*x-4.0263)/1.063)))*exp(-(0.5*x-4.0263)/48.))
    317319#PulseShape.Function.Name:  (1.239*(1-1/(1+exp((0.5*x-2.851)/1.063)))*exp(-(0.5*x-2.851)/19.173))
    318320#PulseShape.Function.Name:  (1.239*(1-1/(1+exp((0.5*x-2.851)/1.5)))*exp(-(0.5*x-2.851)/80.3))
Note: See TracChangeset for help on using the changeset viewer.