Author: [log in to unmask]
Date: Tue May 26 13:52:24 2015
New Revision: 3022
Log:
Change remaining 'EpicsScalarData' names to 'EpicsData' including output collection.
Modified:
java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java
java/trunk/evio/src/test/java/org/hps/evio/EpicsDataTest.java
java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/ExamplePlotDriver.java
java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsData.java
java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsEtProcessor.java
java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsEvioProcessor.java
java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/EpicsLog.java
Modified: java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java Tue May 26 13:52:24 2015
@@ -73,7 +73,7 @@
// Create EPICS data if this is an EPICS control event.
if (EvioEventUtilities.isEpicsEvent(evioEvent)) {
- createEpicsScalarData(evioEvent);
+ createEpicsData(evioEvent);
}
}
@@ -82,9 +82,9 @@
*
* @param evioEvent The EVIO event data.
*/
- void createEpicsScalarData(EvioEvent evioEvent) {
+ void createEpicsData(EvioEvent evioEvent) {
epicsProcessor.process(evioEvent);
- epicsData = epicsProcessor.getEpicsScalarData();
+ epicsData = epicsProcessor.getEpicsData();
}
/**
Modified: java/trunk/evio/src/test/java/org/hps/evio/EpicsDataTest.java
=============================================================================
--- java/trunk/evio/src/test/java/org/hps/evio/EpicsDataTest.java (original)
+++ java/trunk/evio/src/test/java/org/hps/evio/EpicsDataTest.java Tue May 26 13:52:24 2015
@@ -12,8 +12,8 @@
import org.hps.record.composite.CompositeLoopConfiguration;
import org.hps.record.enums.DataSourceType;
import org.hps.record.enums.ProcessingStage;
+import org.hps.record.epics.EpicsData;
import org.hps.record.epics.EpicsEvioProcessor;
-import org.hps.record.epics.EpicsData;
import org.hps.record.evio.EvioDetectorConditionsProcessor;
import org.lcsim.event.EventHeader;
import org.lcsim.util.Driver;
@@ -24,26 +24,26 @@
/**
* Test of reading EPICs scalar data from EVIO and writing it out to LCIO.
- *
+ *
* @author Jeremy McCormick <[log in to unmask]>
*/
public class EpicsDataTest extends TestCase {
-
+
static final String TEST_FILE_URL = "http://www.lcsim.org/test/hps-java/ScalarsTest/hpsecal_004469_1000_events.evio.0";
-
+
public void test() throws IOException {
-
+
// Cache input data file.
- FileCache cache = new FileCache();
- File inputFile = cache.getCachedFile(new URL(TEST_FILE_URL));
-
+ final FileCache cache = new FileCache();
+ final File inputFile = cache.getCachedFile(new URL(TEST_FILE_URL));
+
// Setup conditions and event building.
- DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
- LCSimEventBuilder builder = new LCSimEngRunEventBuilder();
+ final DatabaseConditionsManager manager = DatabaseConditionsManager.getInstance();
+ final LCSimEventBuilder builder = new LCSimEngRunEventBuilder();
manager.addConditionsListener(builder);
-
+
// Setup and run the loop to write out LCIO events with the EPICS scalar data.
- CompositeLoopConfiguration configuration = new CompositeLoopConfiguration();
+ final CompositeLoopConfiguration configuration = new CompositeLoopConfiguration();
configuration.add(new EpicsEvioProcessor());
configuration.setDataSourceType(DataSourceType.EVIO_FILE);
configuration.add(new EvioDetectorConditionsProcessor("HPS-ECalCommissioning-v2"));
@@ -52,24 +52,25 @@
configuration.setProcessingStage(ProcessingStage.LCIO);
configuration.setStopOnEndRun(false);
configuration.setStopOnErrors(false);
- File outputFile = new TestOutputFile("EpicsScalarDataTest.slcio");
- configuration.add(new LCIODriver(outputFile.getPath()));
- CompositeLoop loop = new CompositeLoop();
- loop.setConfiguration(configuration);
+ final File outputFile = new TestOutputFile("EpicsDataTest.slcio");
+ configuration.add(new LCIODriver(outputFile.getPath()));
+ final CompositeLoop loop = new CompositeLoop();
+ loop.setConfiguration(configuration);
loop.loop(100);
-
+
// Read back and print out the scalar data.
- LCSimLoop readLoop = new LCSimLoop();
+ final LCSimLoop readLoop = new LCSimLoop();
readLoop.setLCIORecordSource(outputFile);
readLoop.add(new Driver() {
- public void process(EventHeader event) {
- EpicsData data = EpicsData.read(event);
+ @Override
+ public void process(final EventHeader event) {
+ final EpicsData data = EpicsData.read(event);
if (data != null) {
System.out.println("read back EPICS data ...");
System.out.println(data.toString());
- }
+ }
}
- });
+ });
readLoop.loop(-1);
}
Modified: java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/ExamplePlotDriver.java
=============================================================================
--- java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/ExamplePlotDriver.java (original)
+++ java/trunk/monitoring-drivers/src/main/java/org/hps/monitoring/drivers/example/ExamplePlotDriver.java Tue May 26 13:52:24 2015
@@ -77,7 +77,7 @@
FADCGenericHits - class org.hps.recon.ecal.FADCGenericHit
TriggerConfig - class org.hps.recon.ecal.daqconfig.EvioDAQParser
EcalReadoutHits - class org.lcsim.event.base.BaseRawCalorimeterHit
-EpicsScalarData - interface org.lcsim.event.GenericObject
+EpicsData - interface org.lcsim.event.GenericObject
EcalCalHits - interface org.lcsim.event.CalorimeterHit
ScalarData - interface org.lcsim.event.GenericObject
TriggerBank - class org.hps.recon.ecal.triggerbank.AbstractIntData
@@ -372,4 +372,4 @@
return fitResult;
}
-}
+}
Modified: java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsData.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsData.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsData.java Tue May 26 13:52:24 2015
@@ -23,7 +23,7 @@
/**
* Default collection name in the LCSim events.
*/
- public static final String DEFAULT_COLLECTION_NAME = "EpicsScalarData";
+ public static final String DEFAULT_COLLECTION_NAME = "EpicsData";
/**
* This map contains the list of EPICS key descriptions from the<br/>
@@ -259,4 +259,4 @@
stringMap.put(EPICS_SCALAR_NAMES, object.getKeys());
event.put(collectionName, collection, GenericObject.class, 0, DUMMY_INT_MAP, DUMMY_FLOAT_MAP, stringMap);
}
-}
+}
Modified: java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsEtProcessor.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsEtProcessor.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsEtProcessor.java Tue May 26 13:52:24 2015
@@ -35,9 +35,9 @@
throw new RuntimeException(e);
}
this.evioProcessor.process(evio);
- if (this.evioProcessor.getEpicsScalarData() != null) {
- System.out.println("EpicsEtProcessor created EpicsScalarData ...");
- System.out.println(this.evioProcessor.getEpicsScalarData());
+ if (this.evioProcessor.getEpicsData() != null) {
+ System.out.println("EpicsEtProcessor created EpicsData ...");
+ System.out.println(this.evioProcessor.getEpicsData());
}
}
}
Modified: java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsEvioProcessor.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsEvioProcessor.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsEvioProcessor.java Tue May 26 13:52:24 2015
@@ -23,7 +23,7 @@
*
* @return the {@link EpicsData} object created from record processing
*/
- public EpicsData getEpicsScalarData() {
+ public EpicsData getEpicsData() {
return this.data;
}
Modified: java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/EpicsLog.java
=============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/EpicsLog.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/evio/crawler/EpicsLog.java Tue May 26 13:52:24 2015
@@ -73,7 +73,7 @@
@Override
public void process(final EvioEvent evioEvent) {
this.processor.process(evioEvent);
- this.currentData = this.processor.getEpicsScalarData();
+ this.currentData = this.processor.getEpicsData();
this.update();
}
