1 added + 30 modified, total 31 files
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/AbstractRecordQueue.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/AbstractRecordQueue.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record;
+package org.hps.record;
import java.io.IOException;
import java.util.concurrent.BlockingQueue;
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/DataSourceType.java (rev 0)
+++ java/trunk/record-util/src/main/java/org/hps/record/DataSourceType.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -0,0 +1,25 @@
+package org.hps.record;
+
+/**
+ * The type of data source that will supply events to the app.
+ */
+public enum DataSourceType {
+
+ ET_SERVER("ET Server"),
+ EVIO_FILE("EVIO File"),
+ LCIO_FILE("LCIO File");
+
+ String description;
+
+ private DataSourceType(String description) {
+ this.description = description;
+ }
+
+ public String description() {
+ return description;
+ }
+
+ public boolean isFile() {
+ return this.ordinal() > ET_SERVER.ordinal();
+ }
+}
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/EndRunException.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/EndRunException.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record;
+package org.hps.record;
import java.io.IOException;
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/EndRunProcessor.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/EndRunProcessor.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,8 +1,8 @@
-package org.hps.monitoring.record;
+package org.hps.record;
import org.hps.evio.EventConstants;
-import org.hps.monitoring.record.composite.CompositeRecord;
-import org.hps.monitoring.record.composite.CompositeRecordProcessor;
+import org.hps.record.composite.CompositeRecord;
+import org.hps.record.composite.CompositeRecordProcessor;
/**
* This is a CompositeRecordProcessor for ending the run when an EVIO
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/EtProcessingStep.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/EtProcessingStep.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,12 +1,12 @@
-package org.hps.monitoring.record;
+package org.hps.record;
import static org.freehep.record.loop.RecordLoop.Command.NEXT;
import org.freehep.record.loop.RecordLoop.Command;
import org.freehep.record.source.NoSuchRecordException;
-import org.hps.monitoring.record.composite.CompositeRecord;
-import org.hps.monitoring.record.composite.CompositeRecordProcessor;
-import org.hps.monitoring.record.etevent.EtEventLoop;
+import org.hps.record.composite.CompositeRecord;
+import org.hps.record.composite.CompositeRecordProcessor;
+import org.hps.record.etevent.EtEventLoop;
import org.jlab.coda.et.EtEvent;
/**
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/EventProcessingChain.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/EventProcessingChain.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record;
+package org.hps.record;
import java.io.File;
import java.io.IOException;
@@ -7,16 +7,15 @@
import org.freehep.record.loop.LoopEvent;
import org.freehep.record.loop.LoopListener;
import org.freehep.record.loop.RecordLoop.Command;
-import org.hps.monitoring.enums.DataSourceType;
-import org.hps.monitoring.record.composite.CompositeRecordLoop;
-import org.hps.monitoring.record.composite.CompositeRecordLoopAdapter;
-import org.hps.monitoring.record.composite.CompositeRecordProcessor;
-import org.hps.monitoring.record.etevent.EtEventProcessor;
-import org.hps.monitoring.record.etevent.EtEventSource;
-import org.hps.monitoring.record.evio.EvioEventProcessor;
-import org.hps.monitoring.record.evio.EvioEventQueue;
-import org.hps.monitoring.record.evio.EvioFileSource;
-import org.hps.monitoring.record.lcio.LcioEventQueue;
+import org.hps.record.composite.CompositeRecordLoop;
+import org.hps.record.composite.CompositeRecordLoopAdapter;
+import org.hps.record.composite.CompositeRecordProcessor;
+import org.hps.record.etevent.EtEventProcessor;
+import org.hps.record.etevent.EtEventSource;
+import org.hps.record.evio.EvioEventProcessor;
+import org.hps.record.evio.EvioEventQueue;
+import org.hps.record.evio.EvioFileSource;
+import org.hps.record.lcio.LcioEventQueue;
import org.lcsim.util.Driver;
import org.lcsim.util.loop.LCIOEventSource;
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/EventProcessingConfiguration.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/EventProcessingConfiguration.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,16 +1,15 @@
-package org.hps.monitoring.record;
+package org.hps.record;
import java.util.ArrayList;
import java.util.List;
import org.freehep.record.source.RecordSource;
import org.hps.evio.LCSimEventBuilder;
-import org.hps.monitoring.enums.DataSourceType;
-import org.hps.monitoring.record.EventProcessingChain.ProcessingStage;
-import org.hps.monitoring.record.composite.CompositeRecordProcessor;
-import org.hps.monitoring.record.etevent.EtConnection;
-import org.hps.monitoring.record.etevent.EtEventProcessor;
-import org.hps.monitoring.record.evio.EvioEventProcessor;
+import org.hps.record.EventProcessingChain.ProcessingStage;
+import org.hps.record.composite.CompositeRecordProcessor;
+import org.hps.record.etevent.EtConnection;
+import org.hps.record.etevent.EtEventProcessor;
+import org.hps.record.evio.EvioEventProcessor;
import org.lcsim.util.Driver;
/**
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/EventProcessingThread.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/EventProcessingThread.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record;
+package org.hps.record;
/**
* Thread for running the event processing chain.
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/EventProcessor.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/EventProcessor.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record;
+package org.hps.record;
/**
* This is a generic interface for event processing.
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/EvioProcessingStep.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/EvioProcessingStep.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record;
+package org.hps.record;
import static org.freehep.record.loop.RecordLoop.Command.NEXT;
@@ -8,11 +8,10 @@
import org.freehep.record.loop.RecordLoop.Command;
import org.freehep.record.source.NoSuchRecordException;
import org.hps.evio.EventConstants;
-import org.hps.monitoring.enums.DataSourceType;
-import org.hps.monitoring.record.composite.CompositeRecord;
-import org.hps.monitoring.record.composite.CompositeRecordProcessor;
-import org.hps.monitoring.record.evio.EvioEventLoop;
-import org.hps.monitoring.record.evio.EvioEventQueue;
+import org.hps.record.composite.CompositeRecord;
+import org.hps.record.composite.CompositeRecordProcessor;
+import org.hps.record.evio.EvioEventLoop;
+import org.hps.record.evio.EvioEventQueue;
import org.jlab.coda.et.EtEvent;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.EvioEvent;
java/trunk/record-util/src/main/java/org/hps/record
--- java/trunk/record-util/src/main/java/org/hps/record/LcioProcessingStep.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/LcioProcessingStep.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,14 +1,14 @@
-package org.hps.monitoring.record;
+package org.hps.record;
import static org.freehep.record.loop.RecordLoop.Command.NEXT;
import org.freehep.record.loop.RecordLoop.Command;
import org.freehep.record.source.NoSuchRecordException;
import org.hps.evio.LCSimEventBuilder;
-import org.hps.monitoring.record.composite.CompositeRecord;
-import org.hps.monitoring.record.composite.CompositeRecordProcessor;
-import org.hps.monitoring.record.lcio.LcioEventQueue;
-import org.hps.monitoring.record.lcio.LcioLoop;
+import org.hps.record.composite.CompositeRecord;
+import org.hps.record.composite.CompositeRecordProcessor;
+import org.hps.record.lcio.LcioEventQueue;
+import org.hps.record.lcio.LcioLoop;
import org.jlab.coda.jevio.EvioEvent;
import org.lcsim.event.EventHeader;
import org.lcsim.util.loop.LCSimLoop;
java/trunk/record-util/src/main/java/org/hps/record/composite
--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeRecord.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeRecord.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.composite;
+package org.hps.record.composite;
import org.jlab.coda.et.EtEvent;
import org.jlab.coda.jevio.EvioEvent;
java/trunk/record-util/src/main/java/org/hps/record/composite
--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeRecordLoop.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeRecordLoop.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.composite;
+package org.hps.record.composite;
import org.freehep.record.loop.DefaultRecordLoop;
import org.freehep.record.source.NoSuchRecordException;
java/trunk/record-util/src/main/java/org/hps/record/composite
--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeRecordLoopAdapter.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeRecordLoopAdapter.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.composite;
+package org.hps.record.composite;
import java.util.ArrayList;
import java.util.List;
java/trunk/record-util/src/main/java/org/hps/record/composite
--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeRecordProcessor.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeRecordProcessor.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,6 +1,6 @@
-package org.hps.monitoring.record.composite;
+package org.hps.record.composite;
-import org.hps.monitoring.record.EventProcessor;
+import org.hps.record.EventProcessor;
/**
* An <code>EventProcessor</code> implementation for processing <code>CompositeRecord</code>
java/trunk/record-util/src/main/java/org/hps/record/composite
--- java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeRecordSource.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/composite/CompositeRecordSource.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.composite;
+package org.hps.record.composite;
import java.io.IOException;
java/trunk/record-util/src/main/java/org/hps/record/etevent
--- java/trunk/record-util/src/main/java/org/hps/record/etevent/EtConnection.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/etevent/EtConnection.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,15 +1,11 @@
-package org.hps.monitoring.record.etevent;
+package org.hps.record.etevent;
import java.io.IOException;
-import org.hps.monitoring.gui.model.ConfigurationModel;
import org.jlab.coda.et.EtAttachment;
-import org.jlab.coda.et.EtConstants;
import org.jlab.coda.et.EtEvent;
import org.jlab.coda.et.EtStation;
-import org.jlab.coda.et.EtStationConfig;
import org.jlab.coda.et.EtSystem;
-import org.jlab.coda.et.EtSystemOpenConfig;
import org.jlab.coda.et.enums.Mode;
import org.jlab.coda.et.enums.Modify;
import org.jlab.coda.et.exception.EtBusyException;
@@ -112,67 +108,6 @@
}
}
- public static EtConnection fromConfigurationModel(ConfigurationModel configurationModel) {
- try {
-
- // make a direct connection to ET system's tcp server
- EtSystemOpenConfig etConfig = new EtSystemOpenConfig(
- configurationModel.getEtName(),
- configurationModel.getHost(),
- configurationModel.getPort());
-
- // create ET system object with verbose debugging output
- EtSystem sys = new EtSystem(etConfig, EtConstants.debugInfo);
- sys.open();
-
- // configuration of a new station
- EtStationConfig statConfig = new EtStationConfig();
- //statConfig.setFlowMode(cn.flowMode);
- // FIXME: Flow mode hard-coded.
- statConfig.setFlowMode(EtConstants.stationSerial);
- boolean blocking = configurationModel.getBlocking();
- if (!blocking) {
- statConfig.setBlockMode(EtConstants.stationNonBlocking);
- int qSize = configurationModel.getQueueSize();
- if (qSize > 0) {
- statConfig.setCue(qSize);
- }
- }
- // Set prescale.
- int prescale = configurationModel.getPrescale();
- if (prescale > 0) {
- //System.out.println("setting prescale to " + cn.prescale);
- statConfig.setPrescale(prescale);
- }
-
- // Create the station.
- //System.out.println("position="+config.getInteger("position"));
- EtStation stat = sys.createStation(
- statConfig,
- configurationModel.getStationName(),
- configurationModel.getStationPosition());
-
- // attach to new station
- EtAttachment att = sys.attach(stat);
-
- // Return new connection.
- EtConnection connection = new EtConnection(
- sys,
- att,
- stat,
- configurationModel.getWaitMode(),
- configurationModel.getWaitTime(),
- configurationModel.getChunkSize()
- );
-
- return connection;
-
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
/**
* Read EtEvent objects from the ET ring.
* Preserve all specific Exception types in the throws clause so caller
java/trunk/record-util/src/main/java/org/hps/record/etevent
--- java/trunk/record-util/src/main/java/org/hps/record/etevent/EtConnectionParameters.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/etevent/EtConnectionParameters.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.etevent;
+package org.hps.record.etevent;
import java.net.InetAddress;
import java.net.UnknownHostException;
java/trunk/record-util/src/main/java/org/hps/record/etevent
--- java/trunk/record-util/src/main/java/org/hps/record/etevent/EtEventAdapter.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/etevent/EtEventAdapter.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.etevent;
+package org.hps.record.etevent;
import java.util.ArrayList;
import java.util.List;
java/trunk/record-util/src/main/java/org/hps/record/etevent
--- java/trunk/record-util/src/main/java/org/hps/record/etevent/EtEventLoop.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/etevent/EtEventLoop.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.etevent;
+package org.hps.record.etevent;
import org.freehep.record.loop.DefaultRecordLoop;
import org.freehep.record.source.RecordSource;
java/trunk/record-util/src/main/java/org/hps/record/etevent
--- java/trunk/record-util/src/main/java/org/hps/record/etevent/EtEventProcessor.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/etevent/EtEventProcessor.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,6 +1,6 @@
-package org.hps.monitoring.record.etevent;
+package org.hps.record.etevent;
-import org.hps.monitoring.record.EventProcessor;
+import org.hps.record.EventProcessor;
import org.jlab.coda.et.EtEvent;
/**
java/trunk/record-util/src/main/java/org/hps/record/etevent
--- java/trunk/record-util/src/main/java/org/hps/record/etevent/EtEventQueue.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/etevent/EtEventQueue.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,6 +1,6 @@
-package org.hps.monitoring.record.etevent;
+package org.hps.record.etevent;
-import org.hps.monitoring.record.AbstractRecordQueue;
+import org.hps.record.AbstractRecordQueue;
import org.jlab.coda.et.EtEvent;
/**
java/trunk/record-util/src/main/java/org/hps/record/etevent
--- java/trunk/record-util/src/main/java/org/hps/record/etevent/EtEventSource.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/etevent/EtEventSource.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.etevent;
+package org.hps.record.etevent;
import java.io.IOException;
import java.util.Arrays;
java/trunk/record-util/src/main/java/org/hps/record/evio
--- java/trunk/record-util/src/main/java/org/hps/record/evio/EvioAdapter.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/EvioAdapter.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.evio;
+package org.hps.record.evio;
import java.util.ArrayList;
import java.util.List;
java/trunk/record-util/src/main/java/org/hps/record/evio
--- java/trunk/record-util/src/main/java/org/hps/record/evio/EvioEventLoop.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/EvioEventLoop.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.evio;
+package org.hps.record.evio;
import java.io.IOException;
java/trunk/record-util/src/main/java/org/hps/record/evio
--- java/trunk/record-util/src/main/java/org/hps/record/evio/EvioEventProcessor.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/EvioEventProcessor.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,6 +1,6 @@
-package org.hps.monitoring.record.evio;
+package org.hps.record.evio;
-import org.hps.monitoring.record.EventProcessor;
+import org.hps.record.EventProcessor;
import org.jlab.coda.jevio.EvioEvent;
/**
java/trunk/record-util/src/main/java/org/hps/record/evio
--- java/trunk/record-util/src/main/java/org/hps/record/evio/EvioEventQueue.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/EvioEventQueue.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,6 +1,6 @@
-package org.hps.monitoring.record.evio;
+package org.hps.record.evio;
-import org.hps.monitoring.record.AbstractRecordQueue;
+import org.hps.record.AbstractRecordQueue;
import org.jlab.coda.jevio.EvioEvent;
/**
java/trunk/record-util/src/main/java/org/hps/record/evio
--- java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileProducer.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.evio;
+package org.hps.record.evio;
import java.io.File;
import java.net.InetAddress;
java/trunk/record-util/src/main/java/org/hps/record/evio
--- java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileSource.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/EvioFileSource.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.evio;
+package org.hps.record.evio;
import java.io.File;
import java.io.IOException;
java/trunk/record-util/src/main/java/org/hps/record/lcio
--- java/trunk/record-util/src/main/java/org/hps/record/lcio/LcioEventQueue.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/lcio/LcioEventQueue.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,6 +1,6 @@
-package org.hps.monitoring.record.lcio;
+package org.hps.record.lcio;
-import org.hps.monitoring.record.AbstractRecordQueue;
+import org.hps.record.AbstractRecordQueue;
import org.lcsim.event.EventHeader;
/**
java/trunk/record-util/src/main/java/org/hps/record/lcio
--- java/trunk/record-util/src/main/java/org/hps/record/lcio/LcioLoop.java 2014-08-19 21:43:43 UTC (rev 896)
+++ java/trunk/record-util/src/main/java/org/hps/record/lcio/LcioLoop.java 2014-08-19 21:51:42 UTC (rev 897)
@@ -1,4 +1,4 @@
-package org.hps.monitoring.record.lcio;
+package org.hps.record.lcio;
import org.lcsim.util.loop.LCSimLoop;
SVNspam 0.1