Skip to content

support CCDB variation in decoder/mon12 #341

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
baltzell merged 3 commits into from
Oct 11, 2024
Merged

support CCDB variation in decoder/mon12 #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
daf5ab6
publicize ccdb variation setter
baltzell Oct 10, 2024
ff6896c
add decoder cli CCDB variation option
baltzell Oct 10, 2024
8c5b56c
let user set variation
baltzell Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions common-tools/clas-detector/src/main/java/org/jlab/detector/decode/CLASDecoder4.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -679,6 +683,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);

Expand Down Expand Up @@ -735,9 +740,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<HelicityState> helicityReadings = new TreeSet<>();
Expand Down
2 changes: 1 addition & 1 deletion common-tools/clas-detector/src/main/java/org/jlab/detector/decode/DetectorEventDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down