Author: [log in to unmask]
Date: Mon May 18 13:43:46 2015
New Revision: 2998

Log:
Change class name from EpicsScalarData to EpicsData.

Added:
    java/trunk/evio/src/test/java/org/hps/evio/EpicsDataTest.java
      - copied, changed from r2951, java/trunk/evio/src/test/java/org/hps/evio/EpicsScalarDataTest.java
    java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsData.java
      - copied, changed from r2951, java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsScalarData.java
Removed:
    java/trunk/evio/src/test/java/org/hps/evio/EpicsScalarDataTest.java
    java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsScalarData.java
Modified:
    java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java
    java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsEvioProcessor.java
    java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsGenericObject.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	Mon May 18 13:43:46 2015
@@ -10,7 +10,7 @@
 import org.hps.recon.ecal.triggerbank.TIData;
 import org.hps.recon.ecal.triggerbank.TDCData;
 import org.hps.record.epics.EpicsEvioProcessor;
-import org.hps.record.epics.EpicsScalarData;
+import org.hps.record.epics.EpicsData;
 import org.hps.record.evio.EvioEventUtilities;
 import org.hps.record.scalars.ScalarData;
 import org.hps.record.scalars.ScalarsEvioProcessor;
@@ -36,7 +36,7 @@
     TriggerConfigEvioReader triggerConfigReader = null;
 
     EpicsEvioProcessor epicsProcessor = new EpicsEvioProcessor();
-    EpicsScalarData epicsData;
+    EpicsData epicsData;
 
     ScalarsEvioProcessor scalarProcessor = new ScalarsEvioProcessor();
     ScalarData scalarData;
@@ -78,7 +78,7 @@
     }
 
     /**
-     * Create and cache an {@link org.hps.record.epics.EpicsScalarData} object.
+     * Create and cache an {@link org.hps.record.epics.EpicsData} object.
      *
      * @param evioEvent The EVIO event data.
      */

Copied: java/trunk/evio/src/test/java/org/hps/evio/EpicsDataTest.java (from r2951, java/trunk/evio/src/test/java/org/hps/evio/EpicsScalarDataTest.java)
 =============================================================================
--- java/trunk/evio/src/test/java/org/hps/evio/EpicsScalarDataTest.java	(original)
+++ java/trunk/evio/src/test/java/org/hps/evio/EpicsDataTest.java	Mon May 18 13:43:46 2015
@@ -13,7 +13,7 @@
 import org.hps.record.enums.DataSourceType;
 import org.hps.record.enums.ProcessingStage;
 import org.hps.record.epics.EpicsEvioProcessor;
-import org.hps.record.epics.EpicsScalarData;
+import org.hps.record.epics.EpicsData;
 import org.hps.record.evio.EvioDetectorConditionsProcessor;
 import org.lcsim.event.EventHeader;
 import org.lcsim.util.Driver;
@@ -27,7 +27,7 @@
  * 
  * @author Jeremy McCormick <[log in to unmask]>
  */
-public class EpicsScalarDataTest extends TestCase {
+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";
         
@@ -63,7 +63,7 @@
         readLoop.setLCIORecordSource(outputFile);
         readLoop.add(new Driver() {
             public void process(EventHeader event) {                
-                EpicsScalarData data = EpicsScalarData.read(event);
+                EpicsData data = EpicsData.read(event);
                 if (data != null) {
                     System.out.println("read back EPICS data ...");
                     System.out.println(data.toString());

Copied: java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsData.java (from r2951, java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsScalarData.java)
 =============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsScalarData.java	(original)
+++ java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsData.java	Mon May 18 13:43:46 2015
@@ -18,7 +18,7 @@
  *
  * @author <a href="mailto:[log in to unmask]">Jeremy McCormick</a>
  */
-public final class EpicsScalarData {
+public final class EpicsData {
 
     /**
      * Default collection name in the LCSim events.
@@ -111,8 +111,8 @@
      * @param event the LCIO event
      * @return the EPICS data from the event
      */
-    public static EpicsScalarData read(final EventHeader event) {
-        if (event.hasCollection(GenericObject.class, EpicsScalarData.DEFAULT_COLLECTION_NAME)) {
+    public static EpicsData read(final EventHeader event) {
+        if (event.hasCollection(GenericObject.class, EpicsData.DEFAULT_COLLECTION_NAME)) {
             return read(event, DEFAULT_COLLECTION_NAME);
         } else {
             return null;
@@ -126,12 +126,12 @@
      * @param collectionName the collection name
      * @return the EPICS data from the LCIO event
      */
-    static EpicsScalarData read(final EventHeader event, final String collectionName) {
+    static EpicsData read(final EventHeader event, final String collectionName) {
         final List<GenericObject> collection = event.get(GenericObject.class, collectionName);
         @SuppressWarnings("rawtypes")
         final Map stringMap = event.getMetaData(collection).getStringParameters();
         final String[] keys = (String[]) stringMap.get(EPICS_SCALAR_NAMES);
-        final EpicsScalarData data = new EpicsScalarData();
+        final EpicsData data = new EpicsData();
         data.fromGenericObject(collection.get(0), keys);
         return data;
     }

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	Mon May 18 13:43:46 2015
@@ -6,7 +6,7 @@
 import org.jlab.coda.jevio.EvioEvent;
 
 /**
- * This is an EVIO event processor that will read EPICS events (event tag 31) and turn them into {@link EpicsScalarData}
+ * This is an EVIO event processor that will read EPICS events (event tag 31) and turn them into {@link EpicsData}
  * objects.
  *
  * @author <a href="mailto:[log in to unmask]">Jeremy McCormick</a>
@@ -16,19 +16,19 @@
     /**
      * The current EPICS data object.
      */
-    private EpicsScalarData data;
+    private EpicsData data;
 
     /**
-     * Get the current {@link EpicsScalarData} object created from record processing.
+     * Get the current {@link EpicsData} object created from record processing.
      *
-     * @return the {@link EpicsScalarData} object created from record processing
+     * @return the {@link EpicsData} object created from record processing
      */
-    public EpicsScalarData getEpicsScalarData() {
+    public EpicsData getEpicsScalarData() {
         return this.data;
     }
 
     /**
-     * Process EVIO data and create a {@link EpicsScalarData} if EPICS data bank exists in the event.
+     * Process EVIO data and create a {@link EpicsData} if EPICS data bank exists in the event.
      *
      * @param evio the <code>EvioEvent</code> that possibly has EPICS data
      */
@@ -52,7 +52,7 @@
 
         if (epicsBank != null) {
             final String epicsData = epicsBank.getStringData()[0];
-            this.data = new EpicsScalarData();
+            this.data = new EpicsData();
             this.data.fromString(epicsData);
         }
     }

Modified: java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsGenericObject.java
 =============================================================================
--- java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsGenericObject.java	(original)
+++ java/trunk/record-util/src/main/java/org/hps/record/epics/EpicsGenericObject.java	Mon May 18 13:43:46 2015
@@ -5,7 +5,7 @@
 /**
  * This is an implementation of GenericObject for reading and writing EPICS data. There is no functionality here
  * intended for ends users. Instead, the EPICS data should be accessed using
- * {@link EpicsScalarData#read(org.lcsim.event.EventHeader)} to create the data object from input event data.
+ * {@link EpicsData#read(org.lcsim.event.EventHeader)} to create the data object from input event data.
  *
  * @author <a href="mailto:[log in to unmask]">Jeremy McCormick</a>
  */

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	Mon May 18 13:43:46 2015
@@ -4,7 +4,7 @@
 import java.util.Map;
 
 import org.hps.record.epics.EpicsEvioProcessor;
-import org.hps.record.epics.EpicsScalarData;
+import org.hps.record.epics.EpicsData;
 import org.hps.record.evio.EvioEventProcessor;
 import org.jlab.coda.jevio.EvioEvent;
 
@@ -12,9 +12,9 @@
 
     private final Map<String, Integer> counts = new HashMap<String, Integer>();
 
-    private EpicsScalarData currentData;
+    private EpicsData currentData;
 
-    private final EpicsScalarData logData = new EpicsScalarData();
+    private final EpicsData logData = new EpicsData();
     private final EpicsEvioProcessor processor = new EpicsEvioProcessor();
 
     private final RunSummary runSummary;