diff options
| author | Mike <mjc@avtechpulse.com> | 2000-01-01 01:07:44 +0900 |
|---|---|---|
| committer | Mike <mjc@avtechpulse.com> | 2000-01-01 01:07:44 +0900 |
| commit | 3c2b20b195786723329e3b212e973ea1132184b0 (patch) | |
| tree | da2333f57e9d2312e1ab39f9398a396cc4715647 | |
| parent | 4843f3ffa559863b6f29a16dacbe31b6bb71646d (diff) | |
make sure PW shift tweak works in 156E, fixes change from 6.4.29 aimed at AVPP/AVMR unitsINSTRUMENT_6_4_35
| -rw-r--r-- | device-functions.c | 10 | ||||
| -rw-r--r-- | version.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/device-functions.c b/device-functions.c index 9cf36ab..adf4cc4 100644 --- a/device-functions.c +++ b/device-functions.c @@ -3059,8 +3059,9 @@ int Set_VI_Control(int parameter,int channel,float new_ampl) tweaked_use_ampl += dist_frac * globals.Flash.pw_range_pol_tweaks[channel][range_i][pw_polarity]; - if ((range_i > 0) || (!globals.Flash.volt_ctrl_pw[channel]) ) { - // not used in bot range if bot range is voltage controlled + if ((range_i > 0) || (!globals.Flash.volt_ctrl_pw[channel]) || (globals.Flash.min_pw[channel] > 50.0e-9) ) { + // Not used in bot range if bot range is voltage controlled, for AVPPs and AVMRs. + // Do use it for wide voltage-controlled PW units, like CH2 of 156E. tweaked_use_ampl += globals.Flash.pulse_width_pol_tweak[channel][pw_polarity]; } @@ -3170,8 +3171,9 @@ int Set_VI_Control(int parameter,int channel,float new_ampl) if (parameter == pwl_pw_values) { tweaked_use_ampl += dist_frac * globals.Flash.pw_range_pol_tweaks[channel][range_i][pw_polarity]; - if ((range_i > 0) || (!globals.Flash.volt_ctrl_pw[channel]) ) { - // not used in bot range if bot range is voltage controlled + if ((range_i > 0) || (!globals.Flash.volt_ctrl_pw[channel]) || (globals.Flash.min_pw[channel] > 50.0e-9) ) { + // Not used in bot range if bot range is voltage controlled, for AVPPs and AVMRs. + // Do use it for wide voltage-controlled PW units, like CH2 of 156E. tweaked_use_ampl += globals.Flash.pulse_width_pol_tweak[channel][pw_polarity]; } } @@ -1,2 +1,2 @@ -#define FW_VERSION "6.4.34" +#define FW_VERSION "6.4.35" #define SCPI_version "1996.0" |