From da2e771687d222a02cd390d1946f32ab38fb77de Mon Sep 17 00:00:00 2001 From: Ferdi Franceschini Date: Tue, 20 Mar 2007 11:57:40 +1100 Subject: [PATCH] Update histogram memory configuration in anticipation of new histogram memory server. r1684 | ffr | 2007-03-20 11:57:40 +1100 (Tue, 20 Mar 2007) | 2 lines --- .../hipd/config/hmm/anstohm_full.xml | 24 +++++++++++-------- .../hrpd/config/hmm/anstohm_full.xml | 22 ++++++++++------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/site_ansto/instrument/hipd/config/hmm/anstohm_full.xml b/site_ansto/instrument/hipd/config/hmm/anstohm_full.xml index 161af31c..3a23e19d 100644 --- a/site_ansto/instrument/hipd/config/hmm/anstohm_full.xml +++ b/site_ansto/instrument/hipd/config/hmm/anstohm_full.xml @@ -35,7 +35,7 @@ OFFSET_OAT_Y="0" OFFSET_OAT_T="0" HISTOGRAM_WEIGHT="1" - HISTOGRAM_MODE="XYT" + HISTOGRAM_MODE="XYTP" RATE_MAPPING="ENABLE" TOTAL_HISTOGRAMS="ENABLE" TEST_HISTOGRAMS="ENABLE" @@ -43,21 +43,25 @@ TEST_HISTO_2D_SIZES="1024" DATA_MINMAX="ENABLE" DATA_STREAMING="ZIPBIN" + HISTO_STREAMING="ZIPBIN" LOG_RAW="DISABLE" LOG_EVT="DISABLE" MULTIPLE_DATASETS="ENABLE" - MULTI_HOST_DATA_STITCH_TYPE="X_DIRECTION" - MULTI_HOST_DATA_STITCH_OVERLAP="32" - MULTI_HOST_DATA_JOIN_STITCH_ORDER="INVERTED" + MULTI_HOST_HISTO_STITCH_TYPE="X_DIRECTION" + MULTI_HOST_HISTO_STITCH_OVERLAP="32" + MULTI_HOST_HISTO_JOIN_STITCH_ORDER="INVERTED" + READ_DATA_ORDER_TRANSPOSE_XY="DISABLE" + READ_DATA_ORDER_FLIP_X="DISABLE" + READ_DATA_ORDER_FLIP_Y="ENABLE" VIEW_TYPE="TOTAL_HISTOGRAM_XY" VIEW_COLOUR_TABLE="RAIN" VIEW_SCALING_TYPE="LOG" VIEW_LOG_SCALING_RANGE="2" VIEW_ROOT_SCALING_RANGE="2" - VIEW_ROI_XMIN="0" - VIEW_ROI_XMAX="511" - VIEW_ROI_YMIN="0" - VIEW_ROI_YMAX="511" + VIEW_ROI_XMIN="-1" + VIEW_ROI_XMAX="-1" + VIEW_ROI_YMIN="-1" + VIEW_ROI_YMAX="-1" VIEW_ROI_1DMIN="-1" VIEW_ROI_1DMAX="-1" VIEW_MAG_X="0.25" @@ -78,14 +82,14 @@ SIMULATED_EVENT_T0="0" SIMULATED_EVENT_T1="19999999" SIMULATED_EVENTS_PER_FRAME="10000" - SIMULATED_FRAMES_PER_CYCLE="5000" + SIMULATED_FRAMES_PER_CYCLE="1000" SIMULATED_PARAM_K1="0.9" P7888_PLL_SYNC_METHOD="USING_DUPLICATED_ANODE_PULSE_INPUT" MESYTEC_MCPD2_IP="192.168.168.121" MESYTEC_MCPD2_LAST_IP="192.168.168.122" MESYTEC_USING_PAIRED_TUBES="YES" MESYTEC_TUBE_PAIR_LEN="960" - MESYTEC_PULSER="ENABLE" + MESYTEC_PULSER="DISABLE" BNL_SIMEVENTRATE="0" BNL_FRAME_SCALER="0" BNL_DATASET_SCALER="0" diff --git a/site_ansto/instrument/hrpd/config/hmm/anstohm_full.xml b/site_ansto/instrument/hrpd/config/hmm/anstohm_full.xml index b0362067..66864b08 100644 --- a/site_ansto/instrument/hrpd/config/hmm/anstohm_full.xml +++ b/site_ansto/instrument/hrpd/config/hmm/anstohm_full.xml @@ -35,7 +35,7 @@ OFFSET_OAT_Y="0" OFFSET_OAT_T="0" HISTOGRAM_WEIGHT="1" - HISTOGRAM_MODE="XYT" + HISTOGRAM_MODE="XYTP" RATE_MAPPING="ENABLE" TOTAL_HISTOGRAMS="ENABLE" TEST_HISTOGRAMS="ENABLE" @@ -43,21 +43,25 @@ TEST_HISTO_2D_SIZES="1024" DATA_MINMAX="ENABLE" DATA_STREAMING="ZIPBIN" + HISTO_STREAMING="ZIPBIN" LOG_RAW="DISABLE" LOG_EVT="DISABLE" MULTIPLE_DATASETS="ENABLE" - MULTI_HOST_DATA_STITCH_TYPE="X_DIRECTION" - MULTI_HOST_DATA_STITCH_OVERLAP="20" + MULTI_HOST_HISTO_STITCH_TYPE="X_DIRECTION" + MULTI_HOST_HISTO_STITCH_OVERLAP="32" + MULTI_HOST_HISTO_JOIN_STITCH_ORDER="INVERTED" + READ_DATA_ORDER_TRANSPOSE_XY="DISABLE" + READ_DATA_ORDER_FLIP_X="DISABLE" + READ_DATA_ORDER_FLIP_Y="ENABLE" VIEW_TYPE="TOTAL_HISTOGRAM_XY" VIEW_COLOUR_TABLE="RAIN" VIEW_SCALING_TYPE="LOG" - VIEW_RATE_MAP_TIME_CONST="5" VIEW_LOG_SCALING_RANGE="2" VIEW_ROOT_SCALING_RANGE="2" - VIEW_ROI_XMIN="0" - VIEW_ROI_XMAX="127" - VIEW_ROI_YMIN="0" - VIEW_ROI_YMAX="511" + VIEW_ROI_XMIN="-1" + VIEW_ROI_XMAX="-1" + VIEW_ROI_YMIN="-1" + VIEW_ROI_YMAX="-1" VIEW_ROI_1DMIN="-1" VIEW_ROI_1DMAX="-1" VIEW_MAG_X="4" @@ -91,7 +95,7 @@ BNL_DATASET_SCALER="0" BNL_DATASET_TIMER="ENABLE" BNL_DATASET_FRAME="ENABLE" - BNL_PER_CARD_X_OFFSET="492" + BNL_PER_CARD_X_OFFSET="480" >