The timing chopper isn't necessarily the same as the master chopper.
This commit is contained in:
@ -1,20 +1,20 @@
|
|||||||
|
|
||||||
namespace eval chopper {
|
namespace eval chopper {
|
||||||
variable sim_mode [SplitReply [chopper_simulation]]
|
variable sim_mode [SplitReply [chopper_simulation]]
|
||||||
set master_chopper_id_simvar 1
|
set t0_chopper_id_simvar 1
|
||||||
}
|
}
|
||||||
|
|
||||||
if {$sim_mode == false} {
|
if {$sim_mode == false} {
|
||||||
MakeAsyncProtocol std
|
MakeAsyncProtocol std
|
||||||
MakeAsyncQueue chopsel std chopsel1-bilby 30000
|
MakeAsyncQueue chopsel std chopsel1-bilby 30000
|
||||||
}
|
}
|
||||||
::utility::macro::getset int master_chopper_id {args} {
|
::utility::macro::getset int t0_chopper_id {args} {
|
||||||
variable sim_mode [SplitReply [chopper_simulation]]
|
variable sim_mode [SplitReply [chopper_simulation]]
|
||||||
|
|
||||||
if {$sim_mode == false} {
|
if {$sim_mode == false} {
|
||||||
if {$args == ""} {
|
if {$args == ""} {
|
||||||
chopsel send {get master chopper}
|
chopsel send {get master chopper}
|
||||||
return "master_chopper_id = [SplitReply [chopsel send {get master chopper}]]"
|
return "t0_chopper_id = [SplitReply [chopsel send {get master chopper}]]"
|
||||||
} else {
|
} else {
|
||||||
chopsel send "get master chopper"
|
chopsel send "get master chopper"
|
||||||
chopsel send "enable chopper selection"
|
chopsel send "enable chopper selection"
|
||||||
@ -23,12 +23,16 @@ if {$sim_mode == false} {
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if {$args == ""} {
|
if {$args == ""} {
|
||||||
return master_chopper_id = $::chopper::master_chopper_id_simvar
|
if {$::chopper::t0_chopper_id_simvar < 1 || $::chopper::t0_chopper_id_simvar > 4} {
|
||||||
|
return -code error "Your simulated chopper returned an error"
|
||||||
} else {
|
} else {
|
||||||
set ::chopper::master_chopper_id_simvar $args
|
return t0_chopper_id = $::chopper::t0_chopper_id_simvar
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
set ::chopper::t0_chopper_id_simvar $args
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sicslist setatt master_chopper_id klass NXdisk_chopper
|
sicslist setatt t0_chopper_id klass NXdisk_chopper
|
||||||
sicslist setatt master_chopper_id long_name master_chopper_id
|
sicslist setatt t0_chopper_id long_name t0_chopper_id
|
||||||
sicslist setatt master_chopper_id mutable false
|
sicslist setatt t0_chopper_id mutable false
|
||||||
|
Reference in New Issue
Block a user