Pull back configurations changes from Bilby

site_ansto/instrument/bilby/bilby_configuration.tcl

@@ -24,6 +24,7 @@ fileeval $cfPath(velsel)/velsel.tcl
 fileeval $cfPath(parameters)/parameters.tcl
 fileeval $cfPath(plc)/plc.tcl
 fileeval $cfPath(chopper)/chopper.tcl
+fileeval $cfPath(chopper)/sct_astrium_chopper.tcl
 fileeval $cfPath(optics)/optics.tcl
 fileeval $cfPath(counter)/counter.tcl
 fileeval $cfPath(environment)/temperature/sct_lakeshore_340.tcl

site_ansto/instrument/bilby/config/anticollider/anticollider.tcl

@@ -10,7 +10,7 @@ namespace eval ::anticollider {
   set aptol 0.1
 
   for {set n 1} {$n < 8} {incr n} {
-    foreach {col ap} "col$n ap$n" {
+    foreach {col ap} "pc$n ap$n" {
       set col_limit [expr [SplitReply [$col posit2unit $aperture_posit]] - $coltol]
       set ap_limit [expr [SplitReply [$ap posit2unit $apD10_posit]] - $aptol]
       set acrule [subst {forbid {-inf inf} for $ap when $col in {-inf $col_limit} }]

site_ansto/instrument/bilby/config/hmm/hmm_configuration.tcl

@@ -19,11 +19,14 @@ proc ::histogram_memory::init_OAT_TABLE {} {
     hmm configure fat_frame_frequency $freq
     hmm configure fat_frame_source INTERNAL
 
-    OAT_TABLE -set X { 239.5 238.5 } NXC 240 Y { -0.5 0.5 } NYC 256 T { 0 20000 } NTC 1
+    OAT_TABLE -set X { 239.5 238.5 } NXC 240 Y { -0.5 2.5 } NYC 86 T { 0 20000 } NTC 1
   } message ] {
     return -code error $message
   }
 }
+proc ::histogram_memory::init_FAT_TABLE {} {
+    hmm configure FAT_EVENT_OUTPUT_STREAMING ENABLE
+}
 proc ::histogram_memory::pre_count {} {}
 proc ::histogram_memory::post_count {} {}
 proc ::histogram_memory::isc_initialize {} {
@@ -35,7 +38,7 @@ proc ::histogram_memory::isc_initialize {} {
     ::histogram_memory::init_hmm_objs
     if {$::sim_mode == "true"} {
         hmm configure oat_ntc_eff 1
-        hmm configure $INST_NYC 256
+        hmm configure $INST_NYC 86
         hmm configure $INST_NXC 240
     }
     BAT_TABLE -init
@@ -45,7 +48,7 @@ proc ::histogram_memory::isc_initialize {} {
     FAT_TABLE -init
     ::histogram_memory::ic_initialize
 
-    detector_active_height_mm [expr 5.08 * 256]
+    detector_active_height_mm [expr 5.08 * 86]
     detector_active_width_mm  [expr 5.08 * 240]
     detector_active_height_mm lock
     detector_active_width_mm  lock
@@ -55,6 +58,7 @@ proc ::histogram_memory::isc_initialize {} {
   # hmm configure FAT_SIMULATED_EVENT_X0 $x_bb0
   # hmm configure FAT_SIMULATED_EVENT_X1 $xbbmax
     ::histogram_memory::init_OAT_TABLE
+    ::histogram_memory::init_FAT_TABLE
     ::histogram_memory::upload_config Filler_defaults
 
     set ::histogram_memory::histmem_axes(HOR) /instrument/detector/x_pixel_offset

site_ansto/instrument/bilby/config/motors/Bilby_motion_control_commissioning_checklist.csv

@@ -203,6 +203,7 @@ bs3_part,detector
 bs3_rev_enc_lim,351548
 bs3_steps_per_x,2222.22222222222
 bs3_units,mm
+curtaind_absenchome,15660695
 curtaind_axis,F
 curtaind_axis_number,62
 curtaind_cnts_per_x,32768
@@ -211,6 +212,7 @@ curtaind_dflt_accel_steps,25000
 curtaind_dflt_decel_steps,25000
 curtaind_dflt_speed_steps,150000
 curtaind_fwd_enc_lim,15618875
+curtaind_home,397.8
 curtaind_maxaccel,8
 curtaind_maxdecel,8
 curtaind_maxspeed,8
@@ -219,6 +221,24 @@ curtaind_part,detector
 curtaind_rev_enc_lim,4159255
 curtaind_steps_per_x,100000
 curtaind_units,mm
+curtaindet_absenchome,9554728
+curtaindet_axis,B
+curtaindet_axis_number,58
+curtaindet_cnts_per_x,-524.288
+curtaindet_description,CURTAIN DETECTOR CARRIAGE Y TRANS
+curtaindet_dflt_accel_steps,10000
+curtaindet_dflt_decel_steps,10000
+curtaindet_dflt_speed_steps,150000
+curtaindet_fwd_enc_lim,13683594
+curtaindet_home,8528.7
+curtaindet_maxaccel,25
+curtaindet_maxdecel,25
+curtaindet_maxspeed,25
+curtaindet_mc,mc8
+curtaindet_part,detector
+curtaindet_steps_per_x,-3900
+curtaindet_units,mm
+curtainl_absenchome,17511203
 curtainl_axis,C
 curtainl_axis_number,59
 curtainl_cnts_per_x,32768
@@ -227,6 +247,7 @@ curtainl_dflt_accel_steps,25000
 curtainl_dflt_decel_steps,25000
 curtainl_dflt_speed_steps,150000
 curtainl_fwd_enc_lim,17466632
+curtainl_home,381.6
 curtainl_maxaccel,8
 curtainl_maxdecel,8
 curtainl_maxspeed,8
@@ -235,6 +256,7 @@ curtainl_part,detector
 curtainl_rev_enc_lim,5769621
 curtainl_steps_per_x,100000
 curtainl_units,mm
+curtainr_absenchome,16154534
 curtainr_axis,D
 curtainr_axis_number,60
 curtainr_cnts_per_x,32768
@@ -243,6 +265,7 @@ curtainr_dflt_accel_steps,25000
 curtainr_dflt_decel_steps,25000
 curtainr_dflt_speed_steps,150000
 curtainr_fwd_enc_lim,16104612
+curtainr_home,402.4
 curtainr_maxaccel,8
 curtainr_maxdecel,8
 curtainr_maxspeed,8
@@ -251,6 +274,7 @@ curtainr_part,detector
 curtainr_rev_enc_lim,4371043
 curtainr_steps_per_x,100000
 curtainr_units,mm
+curtainu_absenchome,33536351
 curtainu_axis,E
 curtainu_axis_number,61
 curtainu_cnts_per_x,32768
@@ -259,6 +283,7 @@ curtainu_dflt_accel_steps,25000
 curtainu_dflt_decel_steps,25000
 curtainu_dflt_speed_steps,150000
 curtainu_fwd_enc_lim,33499670
+curtainu_home,394.7
 curtainu_maxaccel,8
 curtainu_maxdecel,8
 curtainu_maxspeed,8
@@ -272,12 +297,12 @@ cutoff_axis_number,26
 cutoff_cnts_per_x,-12288
 cutoff_description,SDH Box
 cutoff_dflt_accel_steps,15000
-cutoff_dflt_decel_steps,0
+cutoff_dflt_decel_steps,15000
 cutoff_dflt_speed_steps,50000
 cutoff_fwd_enc_lim,1189505
-cutoff_maxaccel,0
+cutoff_maxaccel,2
-cutoff_maxdecel,0
+cutoff_maxdecel,2
-cutoff_maxspeed,0
+cutoff_maxspeed,1.33
 cutoff_mc,mc4
 cutoff_part,instrument
 cutoff_pos1,1535698
@@ -285,21 +310,22 @@ cutoff_pos2,3747542
 cutoff_rev_enc_lim,4166803
 cutoff_steps_per_x,37500
 cutoff_units,mm
-det_axis,B
+det_absenchome,1679284
-det_axis_number,58
+det_axis,A
-det_cnts_per_x,524.288
+det_axis_number,57
+det_cnts_per_x,-521.518917523523
 det_description,CURTAIN DETECTOR CARRIAGE Y TRANS
-det_dflt_accel_steps,25000
+det_dflt_accel_steps,10000
-det_dflt_decel_steps,25000
+det_dflt_decel_steps,10000
-det_dflt_speed_steps,100000
+det_dflt_speed_steps,150000
-det_fwd_enc_lim,0
+det_home,18400.4
-det_maxaccel,25
+det_maxaccel,38.6657557364898
-det_maxdecel,25
+det_maxdecel,38.6657557364898
-det_maxspeed,25
+det_maxspeed,38.6657557364898
 det_mc,mc8
 det_part,detector
-det_rev_enc_lim,0
+det_rev_enc_lim,1679747
-det_steps_per_x,3900
+det_steps_per_x,-3879.40173786495
 det_units,mm
 pc1_axis,A
 pc1_axis_number,9
@@ -445,11 +471,6 @@ pc8_part,collimator
 pc8_rev_enc_lim,12893
 pc8_steps_per_x,150000
 pc8_units,mm
-samphi_axis_number,33
-samphi_maxaccel,0
-samphi_maxdecel,0
-samphi_part,sample
-samphi_units,degrees
 samx_axis,D
 samx_axis_number,36
 samx_cnts_per_x,819.2
@@ -466,6 +487,7 @@ samx_part,sample
 samx_rev_enc_lim,41841
 samx_steps_per_x,40000
 samx_units,mm
+samy_absenchome,82584
 samy_axis,E
 samy_axis_number,37
 samy_cnts_per_x,819.2
@@ -474,6 +496,7 @@ samy_dflt_accel_steps,50000
 samy_dflt_decel_steps,50000
 samy_dflt_speed_steps,150000
 samy_fwd_enc_lim,1312327
+samy_home,741.09
 samy_maxaccel,3.75
 samy_maxdecel,3.75
 samy_maxspeed,3.75

site_ansto/instrument/bilby/config/motors/generated_motor_configuration.tcl

@@ -375,6 +375,32 @@ curtaind speed $curtaind_speed
 curtaind accel $curtaind_accel
 curtaind decel $curtaind_decel
 
+# curtaindet configuration
+# CURTAIN DETECTOR CARRIAGE Y TRANS
+# Axis number 58
+Motor curtaindet $motor_driver_type [params\
+  asyncqueue mc8\
+  axis B\
+  units $curtaindet_units\
+  hardlowerlim $curtaindet_rev_lim\
+  hardupperlim $curtaindet_fwd_lim\
+  maxSpeed $curtaindet_maxspeed\
+  maxAccel $curtaindet_maxaccel\
+  maxDecel $curtaindet_maxdecel\
+  stepsPerX $curtaindet_steps_per_x\
+  posit_count 0\
+  absEnc 1\
+  absEncHome $curtaindet_absenchome\
+  cntsPerX $curtaindet_cnts_per_x]
+curtaindet softlowerlim $curtaindet_rev_lim
+curtaindet softupperlim $curtaindet_fwd_lim
+curtaindet home $curtaindet_home
+curtaindet part $curtaindet_part
+curtaindet long_name curtaindet
+curtaindet speed $curtaindet_speed
+curtaindet accel $curtaindet_accel
+curtaindet decel $curtaindet_decel
+
 # curtainl configuration
 # CURTAIN DETECTOR WEST TRANSLATION
 # Axis number 59
@@ -483,10 +509,10 @@ cutoff decel $cutoff_decel
 
 # det configuration
 # CURTAIN DETECTOR CARRIAGE Y TRANS
-# Axis number 58
+# Axis number 57
 Motor det $motor_driver_type [params\
   asyncqueue mc8\
-  axis B\
+  axis A\
   units $det_units\
   hardlowerlim $det_rev_lim\
   hardupperlim $det_fwd_lim\

site_ansto/instrument/bilby/config/motors/sicsmot_attlist.csv

@@ -68,48 +68,43 @@ bs3_fwd_lim,-69.6162
 bs3_home,0.0000
 bs3_rev_lim,0.0000
 bs3_speed,5.6250
-curtaind_absenchome,4159255.0000
 curtaind_accel,0.2500
 curtaind_decel,0.2500
-curtaind_fwd_lim,349.7198
+curtaind_fwd_lim,396.5238
-curtaind_home,0.0000
+curtaind_rev_lim,46.8039
-curtaind_rev_lim,0.0000
 curtaind_speed,1.5000
-curtainl_absenchome,5769621.0000
+curtaindet_accel,2.5641
+curtaindet_decel,2.5641
+curtaindet_fwd_lim,16403.8869
+curtaindet_rev_lim,1500.0000
+curtaindet_speed,38.4615
 curtainl_accel,0.2500
 curtainl_decel,0.2500
-curtainl_fwd_lim,356.9644
+curtainl_fwd_lim,380.2398
-curtainl_home,0.0000
+curtainl_rev_lim,23.2754
-curtainl_rev_lim,0.0000
 curtainl_speed,1.5000
-curtainr_absenchome,4371043.0000
 curtainr_accel,0.2500
 curtainr_decel,0.2500
-curtainr_fwd_lim,358.0801
+curtainr_fwd_lim,400.8765
-curtainr_home,0.0000
+curtainr_rev_lim,42.7964
-curtainr_rev_lim,0.0000
 curtainr_speed,1.5000
-curtainu_absenchome,21804679.0000
 curtainu_accel,0.2500
 curtainu_decel,0.2500
-curtainu_fwd_lim,356.9028
+curtainu_fwd_lim,393.5806
-curtainu_home,0.0000
+curtainu_rev_lim,36.6778
-curtainu_rev_lim,0.0000
 curtainu_speed,1.5000
 cutoff_absenchome,4166803.0000
 cutoff_accel,0.4000
-cutoff_decel,0.0000
+cutoff_decel,0.4000
 cutoff_fwd_lim,242.2931
 cutoff_home,0.0000
 cutoff_rev_lim,0.0000
 cutoff_speed,1.3333
-det_absenchome,0.0000
+det_accel,2.5777
-det_accel,6.4103
+det_decel,2.5777
-det_decel,6.4103
+det_fwd_lim,19000.0000
-det_fwd_lim,0.0000
+det_rev_lim,18401.2878
-det_home,0.0000
+det_speed,38.6658
-det_rev_lim,0.0000
-det_speed,25.6410
 pc1_absenchome,3902.0000
 pc1_accel,0.3333
 pc1_decel,0.3333
@@ -173,12 +168,10 @@ samx_fwd_lim,1012.7844
 samx_home,0.0000
 samx_rev_lim,0.0000
 samx_speed,3.7500
-samy_absenchome,82584.0000
 samy_accel,1.2500
 samy_decel,1.2500
-samy_fwd_lim,1501.1511
+samy_fwd_lim,2242.2411
-samy_home,0.0000
+samy_rev_lim,741.0900
-samy_rev_lim,0.0000
 samy_speed,3.7500
 samz_absenchome,755970.0000
 samz_accel,0.7500