diff --git a/test/DataNumber b/test/DataNumber index 4d167238..24bf9512 100644 --- a/test/DataNumber +++ b/test/DataNumber @@ -1,3 +1,3 @@ - 231 + 247 NEVER, EVER modify or delete this file You'll risk eternal damnation and a reincarnation as a cockroach!|n \ No newline at end of file diff --git a/test/sicsstat.tcl b/test/sicsstat.tcl index ffabebb3..7935d91b 100644 --- a/test/sicsstat.tcl +++ b/test/sicsstat.tcl @@ -9,8 +9,8 @@ lotte setAccess 2 # Motor brumm brumm sign 1.000000 brumm SoftZero 0.000000 -brumm SoftLowerLim -181.000000 -brumm SoftUpperLim 179.000000 +brumm SoftLowerLim -180.000000 +brumm SoftUpperLim 180.000000 brumm Fixed -1.000000 brumm InterruptMode 0.000000 brumm precision 0.010000 @@ -22,8 +22,8 @@ brumm movecount 10.000000 # Motor miau miau sign 1.000000 miau SoftZero 0.000000 -miau SoftLowerLim -181.000000 -miau SoftUpperLim 179.000000 +miau SoftLowerLim -180.000000 +miau SoftUpperLim 180.000000 miau Fixed -1.000000 miau InterruptMode 0.000000 miau precision 0.010000 @@ -33,16 +33,16 @@ miau failafter 3.000000 miau maxretry 3.000000 miau movecount 10.000000 # Counter aba -aba SetPreset 10.000000 +aba SetPreset 1000.000000 aba SetMode Timer # Counter hugo -hugo SetPreset 2.000000 +hugo SetPreset 1000.000000 hugo SetMode Timer # Counter lieselotte -lieselotte SetPreset 2.000000 +lieselotte SetPreset 1000.000000 lieselotte SetMode Timer # Counter multi -multi SetPreset 2.000000 +multi SetPreset 0.000000 multi SetMode Timer # Motor a1 a1 sign 1.000000 @@ -175,13 +175,13 @@ phi failafter 3.000000 phi maxretry 3.000000 phi movecount 10.000000 # Counter scancter -scancter SetPreset 2.000000 +scancter SetPreset 0.000000 scancter SetMode Timer hm CountMode timer -hm preset 2.000000 +hm preset 10.000000 tof CountMode timer -tof preset 2.000000 -tof genbin 500.000000 300.000000 20 +tof preset 10.000000 +tof genbin 10.000000 12.000000 100 tof init #---- tasUB module tasub tasub mono dd 3.350000 @@ -209,13 +209,9 @@ tasub r2 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00 tasub update #----- MultiMotor sa sa recovernampos noeff a3 24 a4 48 -sa recovernampos gurke a3 27.000000 a4 48.000000 -ref addax 2.000000 2.000000 0.000000 35.800000 17.900000 180.642000 86.229000 -ref addax 0.000000 0.000000 3.000000 16.498000 8.249000 268.331000 333.714000 -ref addax 1.000000 0.000000 0.000000 12.478000 6.239000 181.549000 131.232000 -singlex cell 5.4202 5.4202 12.3228 90 90 90 -singlex oldub 0.121551 -0.13871 -0.00211888 -0.138705 -0.121629 0.00105057 -0.00497155 0.00204805 -0.0811159 -singlex ub 0.121567 -0.138726 -0.00212036 -0.138709 -0.121624 0.0010473 -0.00498763 0.00206415 -0.0811627 +singlex cell 0 0 0 0 0 0 +singlex oldub 0 0 0 0 0 0 0 0 0 +singlex ub 0 0 0 0 0 0 0 0 0 singlex planenormal 0 0 0 singlex mode bi singlex spacegroup P @@ -246,3 +242,5 @@ cone qscale 1 cone center unknown simidx sttlim 0.2 simidx anglim 0.5 +elli preset 60 +elli mode timer diff --git a/test/testini.tcl b/test/testini.tcl index 2a10e7c9..c4020814 100644 --- a/test/testini.tcl +++ b/test/testini.tcl @@ -117,6 +117,7 @@ proc scantransfer {} { } scancter transferscript scantransfer +rename scan stscan MakeScanCommand xxxscan scancter test.hdd recover.bin MakePeakCenter xxxscan source scancommand.tcl @@ -540,3 +541,16 @@ pmac01 debug 0 source ../tcl/deltatau.tcl MakeDeltaTau mig15 pmac01 02 } + +set astrium 0 +if {$astrium == 1} { + source ../tcl/astrium.tcl +} + +set el737sec 0 + + +if {$el737sec == 1} { + source ../tcl/el737sec.tcl + MakeSecEL737 elli psts235:3008 +}