hps-java/src/main/java/org/lcsim/hps/evio

TestRunTriggeredReconToEvio.java 1.9 -> 1.10

diff -u -r1.9 -r1.10
--- TestRunTriggeredReconToEvio.java	2 May 2012 00:39:40 -0000	1.9
+++ TestRunTriggeredReconToEvio.java	4 May 2012 17:18:57 -0000	1.10
@@ -20,176 +20,176 @@

  */
 public class TestRunTriggeredReconToEvio extends Driver {

-	EventWriter writer;
-	String rawCalorimeterHitCollectionName = "EcalReadoutHits";
-	String evioOutputFile = "TestRunData.evio";
-	String ecalName = "Ecal";
-	Queue<QueuedEtEvent> builderQueue = null;
-	private int eventsWritten = 0;
-	public static boolean triggerBit = false;
-	HPSEcalConditions ecalIDConverter = null;
-	ECalEvioWriter ecalWriter = null;
-	SVTEvioWriter svtWriter = null;
-	List<EvioWriter> writers = null;
-	private int ecalMode = EventConstants.ECAL_PULSE_INTEGRAL_MODE;
-
-	public TestRunTriggeredReconToEvio() {
-	}
-
-	public void setEcalMode(int ecalMode) {
-		this.ecalMode = ecalMode;
-		if (ecalMode != EventConstants.ECAL_WINDOW_MODE && ecalMode != EventConstants.ECAL_PULSE_MODE && ecalMode != EventConstants.ECAL_PULSE_INTEGRAL_MODE) {
-			throw new IllegalArgumentException("invalid mode " + ecalMode);
-		}
-		if (ecalWriter != null) {
-			ecalWriter.setMode(ecalMode);
-		}
-	}
-
-	public void setEvioOutputFile(String evioOutputFile) {
-		this.evioOutputFile = evioOutputFile;
-	}
-
-	public void setEcalName(String ecalName) {
-		this.ecalName = ecalName;
-		if (ecalWriter != null) {
-			ecalWriter.setEcalName(ecalName);
-		}
-	}
-
-	public void setRawCalorimeterHitCollectionName(String rawCalorimeterHitCollectionName) {
-		this.rawCalorimeterHitCollectionName = rawCalorimeterHitCollectionName;
-		if (ecalWriter != null) {
-			ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
-		}
-	}
-
-	protected void startOfData() {
-		try {
-			writer = new EventWriter(evioOutputFile);
-		} catch (EvioException e) {
-			throw new RuntimeException(e);
-		}
-
-		writers = new ArrayList<EvioWriter>();
-
-		ecalWriter = new ECalEvioWriter();
-		ecalWriter.setMode(ecalMode);
-		ecalWriter.setEcalName(ecalName);
-		ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
-		writers.add(ecalWriter);
-
-		svtWriter = new SVTEvioWriter();
-		writers.add(svtWriter);
-
-		builderQueue = new LinkedList<QueuedEtEvent>();
-	}
-
-	protected void endOfData() {
-		System.out.println(this.getClass().getSimpleName() + " - wrote " + eventsWritten + " EVIO events in job.");
-		try {
-			writer.close();
-		} catch (EvioException e) {
-			throw new RuntimeException(e);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	protected void process(EventHeader event) {
-		if (triggerBit) {
-			// Make a new EVIO event.
-			EventBuilder builder = new EventBuilder(EventConstants.PHYSICS_EVENT_TAG, DataType.BANK, EventConstants.EVENT_BANK_NUM);
-			builderQueue.add(new QueuedEtEvent(builder, writers.size()));
-			triggerBit = false;
-		}
-
-		for (int i = 0; i < writers.size(); i++) {
-			EvioWriter evioWriter = writers.get(i);
-			if (evioWriter.hasData(event)) {
-				System.out.println(evioWriter.getClass().getSimpleName() + ": writing data, event " + event.getEventNumber());
-				EventBuilder builder = null;
-
-				for (QueuedEtEvent queuedEvent : builderQueue) {
-					if (!queuedEvent.getRead(i)) {
-						builder = queuedEvent.getBuilder();
-						queuedEvent.setRead(i);
-						break;
-					}
-				}
-				if (builder == null) {
-					throw new RuntimeException("no queued ET events waiting for an " + evioWriter.getClass().getSimpleName() + " bank");
-				}
-				// Write data.
-				evioWriter.writeData(event, builder);
-			}
-		}
-
-		while (!builderQueue.isEmpty() && builderQueue.peek().banksFilled()) {
-			System.out.println("writing filled ET event, event " + event.getEventNumber());
-			EventBuilder builder = builderQueue.poll().getBuilder();
-			// Write this EVIO event.
-			writeEvioEvent(builder);
-		}
-	}
-
-	private void writeEvioEvent(EventBuilder builder) {
-		EvioBank eventIDBank = new EvioBank(EventConstants.EVENTID_BANK_TAG, DataType.UINT32, 0);
-		int[] eventID = new int[3];
-		eventID[0] = eventsWritten;
-		eventID[1] = 0; //trigger type
-		eventID[2] = 0; //status
-
-		try {
-			eventIDBank.appendIntData(eventID);
-			builder.addChild(builder.getEvent(), eventIDBank);
-		} catch (EvioException e) {
-			throw new RuntimeException(e);
-		}
-
-		builder.setAllHeaderLengths();
-		System.out.printf("Writing event with %d bytes\n", builder.getEvent().getTotalBytes());
-		try {
-			writer.writeEvent(builder.getEvent());
-			++eventsWritten;
-		} catch (EvioException e) {
-			throw new RuntimeException(e);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
-		}
-	}
-
-	private class QueuedEtEvent {
-
-		private EventBuilder builder;
-		public boolean readSVT = false;
-		public boolean readECal = false;
-		private boolean[] readData = null;
-
-		public QueuedEtEvent(EventBuilder builder, int numData) {
-			this.builder = builder;
-			readData = new boolean[numData];
-		}
-
-		public void setRead(int i) {
-			readData[i] = true;
-		}
-
-		public boolean getRead(int i) {
-			return readData[i];
-		}
-
-		public EventBuilder getBuilder() {
-			return builder;
-		}
-
-		public boolean banksFilled() {
-			for (boolean x : readData) {
-				if (!x) {
-					return false;
-				}
-			}
-			return true;
-		}
-	}

+    EventWriter writer;
+    String rawCalorimeterHitCollectionName = "EcalReadoutHits";
+    String evioOutputFile = "TestRunData.evio";
+    String ecalName = "Ecal";
+    Queue<QueuedEtEvent> builderQueue = null;
+    private int eventsWritten = 0;
+    public static boolean triggerBit = false;
+    HPSEcalConditions ecalIDConverter = null;
+    ECalEvioWriter ecalWriter = null;
+    SVTEvioWriter svtWriter = null;
+    List<EvioWriter> writers = null;
+    private int ecalMode = EventConstants.ECAL_PULSE_INTEGRAL_MODE;
+
+    public TestRunTriggeredReconToEvio() {
+    }
+
+    public void setEcalMode(int ecalMode) {
+        this.ecalMode = ecalMode;
+        if (ecalMode != EventConstants.ECAL_WINDOW_MODE && ecalMode != EventConstants.ECAL_PULSE_MODE && ecalMode != EventConstants.ECAL_PULSE_INTEGRAL_MODE) {
+            throw new IllegalArgumentException("invalid mode " + ecalMode);
+        }
+        if (ecalWriter != null) {
+            ecalWriter.setMode(ecalMode);
+        }
+    }
+
+    public void setEvioOutputFile(String evioOutputFile) {
+        this.evioOutputFile = evioOutputFile;
+    }
+
+    public void setEcalName(String ecalName) {
+        this.ecalName = ecalName;
+        if (ecalWriter != null) {
+            ecalWriter.setEcalName(ecalName);
+        }
+    }
+
+    public void setRawCalorimeterHitCollectionName(String rawCalorimeterHitCollectionName) {
+        this.rawCalorimeterHitCollectionName = rawCalorimeterHitCollectionName;
+        if (ecalWriter != null) {
+            ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
+        }
+    }
+
+    protected void startOfData() {
+        try {
+            writer = new EventWriter(evioOutputFile);
+        } catch (EvioException e) {
+            throw new RuntimeException(e);
+        }
+
+        writers = new ArrayList<EvioWriter>();
+
+        ecalWriter = new ECalEvioWriter();
+        ecalWriter.setMode(ecalMode);
+        ecalWriter.setEcalName(ecalName);
+        ecalWriter.setHitCollectionName(rawCalorimeterHitCollectionName);
+        writers.add(ecalWriter);
+
+        svtWriter = new SVTEvioWriter();
+        writers.add(svtWriter);
+
+        builderQueue = new LinkedList<QueuedEtEvent>();
+    }
+
+    protected void endOfData() {
+        System.out.println(this.getClass().getSimpleName() + " - wrote " + eventsWritten + " EVIO events in job.");
+        try {
+            writer.close();
+        } catch (EvioException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    protected void process(EventHeader event) {
+        if (triggerBit) {
+            // Make a new EVIO event.
+            EventBuilder builder = new EventBuilder(EventConstants.PHYSICS_EVENT_TAG, DataType.BANK, EventConstants.EVENT_BANK_NUM);
+            builderQueue.add(new QueuedEtEvent(builder, writers.size()));
+            EvioBank eventIDBank = new EvioBank(EventConstants.EVENTID_BANK_TAG, DataType.UINT32, 0);
+            int[] eventID = new int[3];
+            eventID[0] = eventsWritten;
+            eventID[1] = 0; //trigger type
+            eventID[2] = 0; //status
+
+            try {
+                eventIDBank.appendIntData(eventID);
+                builder.addChild(builder.getEvent(), eventIDBank);
+            } catch (EvioException e) {
+                throw new RuntimeException(e);
+            }
+
+            triggerBit = false;
+        }
+
+        for (int i = 0; i < writers.size(); i++) {
+            EvioWriter evioWriter = writers.get(i);
+            if (evioWriter.hasData(event)) {
+                System.out.println(evioWriter.getClass().getSimpleName() + ": writing data, event " + event.getEventNumber());
+                EventBuilder builder = null;
+
+                for (QueuedEtEvent queuedEvent : builderQueue) {
+                    if (!queuedEvent.getRead(i)) {
+                        builder = queuedEvent.getBuilder();
+                        queuedEvent.setRead(i);
+                        break;
+                    }
+                }
+                if (builder == null) {
+                    throw new RuntimeException("no queued ET events waiting for an " + evioWriter.getClass().getSimpleName() + " bank");
+                }
+                // Write data.
+                evioWriter.writeData(event, builder);
+            }
+        }
+
+        while (!builderQueue.isEmpty() && builderQueue.peek().banksFilled()) {
+            System.out.println("writing filled ET event, event " + event.getEventNumber());
+            EventBuilder builder = builderQueue.poll().getBuilder();
+            // Write this EVIO event.
+            writeEvioEvent(builder);
+        }
+    }
+
+    private void writeEvioEvent(EventBuilder builder) {
+        builder.setAllHeaderLengths();
+        System.out.printf("Writing event with %d bytes\n", builder.getEvent().getTotalBytes());
+        try {
+            writer.writeEvent(builder.getEvent());
+            ++eventsWritten;
+        } catch (EvioException e) {
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private class QueuedEtEvent {
+
+        private EventBuilder builder;
+        public boolean readSVT = false;
+        public boolean readECal = false;
+        private boolean[] readData = null;
+
+        public QueuedEtEvent(EventBuilder builder, int numData) {
+            this.builder = builder;
+            readData = new boolean[numData];
+        }
+
+        public void setRead(int i) {
+            readData[i] = true;
+        }
+
+        public boolean getRead(int i) {
+            return readData[i];
+        }
+
+        public EventBuilder getBuilder() {
+            return builder;
+        }
+
+        public boolean banksFilled() {
+            for (boolean x : readData) {
+                if (!x) {
+                    return false;
+                }
+            }
+            return true;
+        }
+    }

\ No newline at end of file

Commit in `hps-java/src/main/java/org/lcsim/hps/evio` on MAIN
`ECalEvioWriter.java`	+31	-24	1.4 -> 1.5
`BasicEvioFileReader.java`	+6	-3	1.6 -> 1.7
`ECalEvioReader.java`	+28	-31	1.12 -> 1.13
`TestRunTriggeredReconToEvio.java`	+172	-172	1.9 -> 1.10
	+237	-230