From 26fbcc2932d6173ac94671eccd30f70e32e62989 Mon Sep 17 00:00:00 2001 From: ian Date: Wed, 4 Jan 2006 19:21:35 +0000 Subject: [PATCH] separate T option for make-clocks --- detpic/make-clocks | 10 ++++++---- detpic/program.clocks | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/detpic/make-clocks b/detpic/make-clocks index 8b2eb6d..b6f3369 100755 --- a/detpic/make-clocks +++ b/detpic/make-clocks @@ -118,7 +118,7 @@ sub doline () { s/\s*[;\#].*//; return unless m/^\S/; die "$_ ?" unless - m/^(\w+)\s+(M|S|MS)\s+(\w+)\s+([0-9.]+)(s|ms|us|ns|Hz|kHz|MHz)((?:[-+][0-9.]+cy)?)$/; + m/^(\w+)\s+([MST]+)\s+(\w+)\s+([0-9.]+)(s|ms|us|ns|Hz|kHz|MHz)((?:[-+][0-9.]+cy)?)$/; ($orgname,$mswant,$how,$baseinterval,$unit,$cy) = ($1,$2,$3,$4,$5,$6,$7); $specd= $baseinterval.$unit.$cy; if ($unit =~ m/M/) { $baseinterval *= 1.e6; } @@ -132,9 +132,11 @@ sub doline () { else { die "$cy ?"; } p("\n"); p(";========== $orgname ($specd: ${baseinterval}s, ${cy}cy) ==========\n"); - provide_interval($orgname, $baseinterval, 'us', 1.e-6); - provide_interval($orgname, $baseinterval, 'ms', 1.e-3); - provide_interval($orgname, $baseinterval, 's', 1.0); + if ($mswant =~ m/T/) { + provide_interval($orgname, $baseinterval, 'us', 1.e-6); + provide_interval($orgname, $baseinterval, 'ms', 1.e-3); + provide_interval($orgname, $baseinterval, 's', 1.0); + } foreach $ms (qw(m s)) { next unless $mswant =~ m/$ms/i; $msclock= "${ms}clock"; diff --git a/detpic/program.clocks b/detpic/program.clocks index 31ba874..8584d2e 100644 --- a/detpic/program.clocks +++ b/detpic/program.clocks @@ -9,7 +9,7 @@ # then time to overflow will be specified time points MS T3ov 10ms -tick MS T2period 1ms +tick MST T2period 1ms nmra M T0ov8 58us-10cy ; we do morse at 18wpm according to the PARIS standard -- 2.30.2