Skip to content

bugfix, tabs->spaces #115

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
raffaelladevita merged 2 commits into from
Jun 20, 2025
Merged

bugfix, tabs->spaces #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0134688
bugfix, tabs->spaces
Jun 18, 2025
c5167ca
simplify
Jun 18, 2025
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
44 changes: 20 additions & 24 deletions src/main/java/org/clas/viewer/EventViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
import org.jlab.utils.benchmark.BenchmarkTimer;
import org.jlab.utils.options.OptionParser;


/**
*
* @author ziegler
Expand Down Expand Up @@ -225,8 +225,8 @@ public void initMenus() {

String[] triggers = { "Electron OR", "Electron Sec 1","Electron Sec 2","Electron Sec 3",
"Electron Sec 4","Electron Sec 5","Electron Sec 6",
"","","","","","","","","","","","","","","","","","","","","","","","",
"Random Pulser"};
"","","","","","","","","","","","","","","","","","","","","","","","",
"Random Pulser"};

JMenu trigBitsBeam = new JMenu("TriggerBits");
trigBitsBeam.getAccessibleContext().setAccessibleDescription("Select Trigger Bits");
Expand All @@ -251,7 +251,6 @@ public void itemStateChanged(ItemEvent e) {
boolean bstate = ((this.triggerMask >> i) & 1) == 1;
bb.setState(bstate);
trigBitsBeam.add(bb);

}
menuBar.add(trigBitsBeam);
}
Expand Down Expand Up @@ -544,13 +543,19 @@ private int getEventNumber(DataEvent event) {
return bank != null ? bank.getInt("event", 0): this.eventCounter;
}

private int getEventNumber(Event event) {
Bank bank = new Bank(schemaFactory.getSchema("RUN::config"));
event.read(bank);
return bank.getRows()>0 ? bank.getInt("event", 0): this.eventCounter;
}

private void copyHitList(String k, String mon1, String mon2) {
if (k == null ? mon1 != null : !k.equals(mon1)) return;
this.monitors.get(mon1).ttdcs = this.monitors.get(mon2).ttdcs;
this.monitors.get(mon1).ftdcs = this.monitors.get(mon2).ftdcs;
this.monitors.get(mon1).fadcs = this.monitors.get(mon2).fadcs;
this.monitors.get(mon1).fapmt = this.monitors.get(mon2).fapmt;
this.monitors.get(mon1).ftpmt = this.monitors.get(mon2).ftpmt;
if (k == null ? mon1 != null : !k.equals(mon1)) return;
this.monitors.get(mon1).ttdcs = this.monitors.get(mon2).ttdcs;
this.monitors.get(mon1).ftdcs = this.monitors.get(mon2).ftdcs;
this.monitors.get(mon1).fadcs = this.monitors.get(mon2).fadcs;
this.monitors.get(mon1).fapmt = this.monitors.get(mon2).fapmt;
this.monitors.get(mon1).ftpmt = this.monitors.get(mon2).ftpmt;
}


Expand All @@ -564,21 +569,12 @@ public void dataEventAction(DataEvent event) {
if (beamMonitor != null && !beamMonitor.getBeamStatus()) {
return;
}

// convert event to HIPO:
DataEvent hipo = event;
DataEvent hipo = event;
if (event instanceof EvioDataEvent) {
Event dump = this.clasDecoder.getDataEvent(event);
Bank header = this.clasDecoder.createHeaderBank(this.ccdbRunNumber, getEventNumber(event), (double)0, (double)0);
Bank trigger = this.clasDecoder.createTriggerBank();
Bank helicity = this.clasDecoder.createHelicityDecoderBank((EvioDataEvent)event);
Bank onlineHelicity = this.clasDecoder.createOnlineHelicityBank();
if(onlineHelicity!=null) dump.write(onlineHelicity);
if (header != null) dump.write(header);
if (trigger != null) dump.write(trigger);
if (helicity != null) dump.write(helicity);
this.clasDecoder.extractPulses(dump); // Apply AHDC Decoder !!!
hipo = new HipoDataEvent(dump, this.schemaFactory);
Event dump = this.clasDecoder.getDecodedEvent((EvioDataEvent)event, this.ccdbRunNumber, eventCounter, (double)0, (double)0);
hipo = new HipoDataEvent(dump, this.schemaFactory);
}

// if header bank is missing, do nothing
Expand Down Expand Up @@ -999,5 +995,5 @@ else if (parser.getOption("-batch").intValue() != 0) {
public void processShape(DetectorShape2D dsd) {
throw new UnsupportedOperationException("Not supported yet."); // Generated from nbfs://nbhost/SystemFileSystem/Templates/Classes/Code/GeneratedMethodBody
}

}