From daf5ab645d89870e690881bb6602e1829955cdd3 Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 10 Oct 2024 07:51:53 -0400 Subject: [PATCH 1/3] publicize ccdb variation setter --- .../java/org/jlab/detector/decode/DetectorEventDecoder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java index 5d45354588..f1e9f86737 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java @@ -41,7 +41,7 @@ public void setTimestamp(String timestamp) { scalerManager.setTimeStamp(timestamp); } - private void setVariation(String variation) { + public void setVariation(String variation) { translationManager.setVariation(variation); fitterManager.setVariation(variation); scalerManager.setVariation(variation); From ff6896ca95f10a8dc83a63400b0707ed938cd15c Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 10 Oct 2024 07:54:53 -0400 Subject: [PATCH 2/3] add decoder cli CCDB variation option --- .../main/java/org/jlab/detector/decode/CLASDecoder4.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java index dae7677ed7..2b5410b68c 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java @@ -679,6 +679,7 @@ public static void main(String[] args){ parser.addOption("-t", "-0.5","torus current in the header bank"); parser.addOption("-s", "0.5","solenoid current in the header bank"); parser.addOption("-x", null,"CCDB timestamp (MM/DD/YYYY-HH:MM:SS)"); + parser.addOption("-v","default","CCDB variation"); parser.parse(args); @@ -735,9 +736,10 @@ public static void main(String[] args){ decoder.setRunNumber(nrun,true); } - if (parser.getOption("-x").getValue() != null) { + if (parser.getOption("-x").getValue() != null) decoder.detectorDecoder.setTimestamp(parser.getOption("-x").stringValue()); - } + if (parser.getOption("-v").getValue() != null) + decoder.detectorDecoder.setVariation(parser.getOption("-v").stringValue()); // Store all helicity readings, ordered by timestamp: TreeSet helicityReadings = new TreeSet<>(); From 8c5b56c21b7abb207afe056b333f860c928ca17d Mon Sep 17 00:00:00 2001 From: Nathan Baltzell Date: Thu, 10 Oct 2024 08:00:21 -0400 Subject: [PATCH 3/3] let user set variation --- .../src/main/java/org/jlab/detector/decode/CLASDecoder4.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java index 2b5410b68c..0796b64e00 100644 --- a/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java +++ b/common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java @@ -78,6 +78,10 @@ public static CLASDecoder createDecoderDevel(){ return decoder; } + public void setVariation(String variation) { + detectorDecoder.setVariation(variation); + } + public void setDebugMode(int mode){ this.decoderDebugMode = mode; }