Author: [log in to unmask]
Date: Thu Oct 8 09:41:21 2015
New Revision: 3808
Log:
move some stuff to record package, disable excpetions in svt header checks
Added:
java/trunk/record-util/src/main/java/org/hps/record/svt/SvtEventHeaderChecker.java
- copied, changed from r3807, java/trunk/evio/src/main/java/org/hps/evio/SvtEventHeaderChecker.java
java/trunk/record-util/src/main/java/org/hps/record/svt/SvtEvioExceptions.java
- copied, changed from r3807, java/trunk/evio/src/main/java/org/hps/evio/SvtEvioExceptions.java
java/trunk/record-util/src/main/java/org/hps/record/svt/SvtEvioUtils.java
- copied, changed from r3807, java/trunk/evio/src/main/java/org/hps/evio/SvtEvioUtils.java
java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaDataReaderDriver.java
- copied, changed from r3807, java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaData.java
Removed:
java/trunk/evio/src/main/java/org/hps/evio/SvtEventHeaderChecker.java
java/trunk/evio/src/main/java/org/hps/evio/SvtEvioExceptions.java
java/trunk/evio/src/main/java/org/hps/evio/SvtEvioUtils.java
java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaData.java
Modified:
java/trunk/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java
java/trunk/evio/src/main/java/org/hps/evio/AugmentedSvtEvioReader.java
java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java
java/trunk/evio/src/main/java/org/hps/evio/SvtEventFlagger.java
java/trunk/evio/src/main/java/org/hps/evio/SvtEvioReader.java
java/trunk/evio/src/main/java/org/hps/evio/TestRunSvtEvioReader.java
java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/EvioToLcio_LinkError.lcsim
java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderAnalysisDriver.java
java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderAnalysisDriver.java
Modified: java/trunk/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java Thu Oct 8 09:41:21 2015
@@ -6,9 +6,10 @@
import java.util.Map;
import java.util.logging.Logger;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioReaderException;
+import org.hps.record.svt.SvtEvioUtils;
import org.hps.record.svt.SvtHeaderDataInfo;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioReaderException;
import org.hps.util.Pair;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.DataType;
Modified: java/trunk/evio/src/main/java/org/hps/evio/AugmentedSvtEvioReader.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/AugmentedSvtEvioReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/AugmentedSvtEvioReader.java Thu Oct 8 09:41:21 2015
@@ -5,8 +5,16 @@
import java.util.List;
-import org.hps.evio.SvtEvioExceptions.*;
+import org.hps.record.svt.SvtEventHeaderChecker;
import org.hps.record.svt.SvtHeaderDataInfo;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderApvBufferAddressException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderApvFrameCountException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderApvReadErrorException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderMultisampleErrorBitException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderOFErrorException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderSkipCountException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderSyncErrorException;
import org.lcsim.event.EventHeader;
import org.lcsim.lcio.LCIOUtil;
@@ -16,6 +24,8 @@
*/
public class AugmentedSvtEvioReader extends SvtEvioReader {
+ private final static boolean throwHeaderExceptions = false;
+
/**
*
*/
@@ -27,14 +37,22 @@
@Override
protected void processSvtHeaders(List<SvtHeaderDataInfo> headers, EventHeader lcsimEvent) throws SvtEvioHeaderException {
+
// Check that the SVT header data is valid
- // Catch the exception locally, add stuff to the event, then throw it again
+ // Catch the exceptions locally, add stuff to the event, then throw it again
// and handle it outside
+
+ // if we want we can control the behavior here depending on if we want the run to stop
+
try {
-
SvtEventHeaderChecker.checkSvtHeaders(headers);
-
- } catch(SvtEvioHeaderException e) {
+ } catch (SvtEvioHeaderApvBufferAddressException
+ | SvtEvioHeaderApvFrameCountException
+ | SvtEvioHeaderMultisampleErrorBitException
+ | SvtEvioHeaderApvReadErrorException
+ | SvtEvioHeaderSyncErrorException
+ | SvtEvioHeaderOFErrorException
+ | SvtEvioHeaderSkipCountException e) {
// add skimming flag
SvtEventFlagger.voidAddHeaderCheckResultToMetaData(false, lcsimEvent);
@@ -43,10 +61,14 @@
SvtEventFlagger.AddHeaderInfoToMetaData(headers, lcsimEvent);
// then throw the exception again to be caught in the event builder
- throw new SvtEvioHeaderException(e);
-
- }
-
+ if(throwHeaderExceptions)
+ throw new SvtEvioHeaderException(e);
+ else {
+ LOGGER.info("caught SvtEvioHeaderException exception for event " + lcsimEvent.getEventNumber());
+ return; // need to return to prevent me from setting the GOOD flag outside the caught exceptions.
+ }
+ }
+
// add skimming flag - the header is OK since I would never get here otherwise
SvtEventFlagger.voidAddHeaderCheckResultToMetaData(true, lcsimEvent);
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 Thu Oct 8 09:41:21 2015
@@ -5,20 +5,20 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderApvBufferAddressException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderApvFrameCountException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderApvReadErrorException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderMultisampleErrorBitException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderOFErrorException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderSkipCountException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderSyncErrorException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioReaderException;
import org.hps.record.epics.EpicsData;
import org.hps.record.epics.EpicsEvioProcessor;
import org.hps.record.evio.EvioEventUtilities;
import org.hps.record.scalers.ScalerData;
import org.hps.record.scalers.ScalersEvioProcessor;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderApvBufferAddressException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderApvFrameCountException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderApvReadErrorException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderMultisampleErrorBitException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderOFErrorException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderSkipCountException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderSyncErrorException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioReaderException;
import org.hps.record.triggerbank.AbstractIntData;
import org.hps.record.triggerbank.AbstractIntData.IntBankDefinition;
import org.hps.record.triggerbank.HeadBankData;
@@ -155,29 +155,6 @@
// Make SVT RawTrackerHits.
try {
svtReader.makeHits(evioEvent, lcsimEvent);
- } catch (final SvtEvioHeaderMultisampleErrorBitException e) {
- LOGGER.log(Level.SEVERE, "Error reading header information from the SVT for run " + lcsimEvent.getRunNumber() + " event " + lcsimEvent.getEventNumber() + ". Don't stop!", e);
- //throw new RuntimeException(e);
- } catch (final SvtEvioHeaderSkipCountException e) {
- LOGGER.log(Level.SEVERE, "Error reading header information from the SVT for run " + lcsimEvent.getRunNumber() + " event " + lcsimEvent.getEventNumber() + ". Don't stop!", e);
- //throw new RuntimeException(e);
- } catch (final SvtEvioHeaderOFErrorException e) {
- LOGGER.log(Level.SEVERE, "Error reading header information from the SVT for run " + lcsimEvent.getRunNumber() + " event " + lcsimEvent.getEventNumber() + ". Don't stop!", e);
- //throw new RuntimeException(e);
- } catch (final SvtEvioHeaderApvBufferAddressException e) {
- LOGGER.log(Level.SEVERE, "Error reading header information from the SVT for run " + lcsimEvent.getRunNumber() + " event " + lcsimEvent.getEventNumber() + ". Don't stop!", e);
- //throw new RuntimeException(e);
- } catch (final SvtEvioHeaderApvFrameCountException e) {
- LOGGER.log(Level.SEVERE, "Error reading header information from the SVT for run " + lcsimEvent.getRunNumber() + " event " + lcsimEvent.getEventNumber() + ". Don't stop!", e);
- //throw new RuntimeException(e);
- } catch (final SvtEvioHeaderApvReadErrorException e) {
- LOGGER.log(Level.SEVERE, "Error reading header information from the SVT for run " + lcsimEvent.getRunNumber() + " event " + lcsimEvent.getEventNumber() + ". Don't stop!", e);
- //throw new RuntimeException(e);
- } catch (final SvtEvioHeaderSyncErrorException e) {
- LOGGER.log(Level.SEVERE, "Error reading header information from the SVT for run " + lcsimEvent.getRunNumber() + " event " + lcsimEvent.getEventNumber() + ". Don't stop!", e);
- //throw new RuntimeException(e);
- } catch (final SvtEvioHeaderException e) {
- LOGGER.log(Level.SEVERE, "Generic error reading header information from the SVT for run " + lcsimEvent.getRunNumber() + " event " + lcsimEvent.getEventNumber() + ". Don't stop!", e);
} catch (final SvtEvioReaderException e) {
LOGGER.log(Level.SEVERE, "Error making SVT hits for run " + lcsimEvent.getRunNumber() + " event " + lcsimEvent.getEventNumber() + ". Don't stop!", e);
} catch (final Exception e) {
Modified: java/trunk/evio/src/main/java/org/hps/evio/SvtEventFlagger.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SvtEventFlagger.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/SvtEventFlagger.java Thu Oct 8 09:41:21 2015
@@ -14,7 +14,6 @@
import org.hps.record.svt.SvtHeaderDataInfo;
import org.hps.record.triggerbank.AbstractIntData;
import org.hps.record.triggerbank.HeadBankData;
-import org.lcsim.conditions.ConditionsManager;
import org.lcsim.detector.tracker.silicon.HpsSiSensor;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
@@ -23,6 +22,7 @@
/**
*
* @author Sho Uemura <[log in to unmask]>
+ * @author Per Hansson Adrian <[log in to unmask]>
* @version $Id: $
*/
public class SvtEventFlagger {
@@ -170,6 +170,11 @@
for(int iSvtHeader=0; iSvtHeader < headers.size();++iSvtHeader) {
svtHeaders[iSvtHeader] = headers.get(iSvtHeader).getHeader();
svtTails[iSvtHeader] = headers.get(iSvtHeader).getTail();
+
+ lcsimEvent.getIntegerParameters().put("svt_event_header_roc" + headers.get(iSvtHeader).getNum(), new int[]{headers.get(iSvtHeader).getHeader()});
+ lcsimEvent.getIntegerParameters().put("svt_event_tail_roc" + headers.get(iSvtHeader).getNum(), new int[]{headers.get(iSvtHeader).getTail()});
+
+
int nMS = headers.get(iSvtHeader).getNumberOfMultisampleHeaders();
int[] multisampleHeadersArray = new int[4*nMS];
for(int iMS = 0; iMS < nMS; ++iMS ) {
@@ -178,9 +183,6 @@
}
lcsimEvent.getIntegerParameters().put("svt_multisample_headers_roc" + headers.get(iSvtHeader).getNum(), multisampleHeadersArray);
}
- lcsimEvent.getIntegerParameters().put("svt_event_headers", svtHeaders);
- lcsimEvent.getIntegerParameters().put("svt_event_tails", svtTails);
-
}
}
Modified: java/trunk/evio/src/main/java/org/hps/evio/SvtEvioReader.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SvtEvioReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/SvtEvioReader.java Thu Oct 8 09:41:21 2015
@@ -2,9 +2,10 @@
import java.util.List;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioReaderException;
+import org.hps.record.svt.SvtEvioUtils;
import org.hps.record.svt.SvtHeaderDataInfo;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioReaderException;
import org.hps.util.Pair;
import org.jlab.coda.jevio.BaseStructure;
import org.jlab.coda.jevio.EvioEvent;
@@ -12,7 +13,6 @@
import org.lcsim.event.EventHeader;
import org.lcsim.event.RawTrackerHit;
import org.lcsim.geometry.Subdetector;
-import org.lcsim.lcio.LCIOUtil;
/**
* SVT EVIO reader used to convert SVT bank integer data to LCIO objects.
Modified: java/trunk/evio/src/main/java/org/hps/evio/TestRunSvtEvioReader.java
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TestRunSvtEvioReader.java (original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TestRunSvtEvioReader.java Thu Oct 8 09:41:21 2015
@@ -2,7 +2,8 @@
import java.util.List;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderException;
+import org.hps.record.svt.SvtEvioExceptions.SvtEvioHeaderException;
+import org.hps.record.svt.SvtEvioUtils;
import org.hps.record.svt.SvtHeaderDataInfo;
import org.hps.util.Pair;
import org.jlab.coda.jevio.BaseStructure;
Copied: java/trunk/record-util/src/main/java/org/hps/record/svt/SvtEventHeaderChecker.java (from r3807, java/trunk/evio/src/main/java/org/hps/evio/SvtEventHeaderChecker.java)
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SvtEventHeaderChecker.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/svt/SvtEventHeaderChecker.java Thu Oct 8 09:41:21 2015
@@ -1,21 +1,14 @@
/**
*
*/
-package org.hps.evio;
+package org.hps.record.svt;
import java.util.Arrays;
import java.util.List;
-import java.util.logging.Level;
import java.util.logging.Logger;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderApvBufferAddressException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderApvFrameCountException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderApvReadErrorException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderMultisampleErrorBitException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderOFErrorException;
-import org.hps.evio.SvtEvioExceptions.SvtEvioHeaderSkipCountException;
-import org.hps.record.svt.SvtHeaderDataInfo;
+import org.hps.record.svt.SvtEvioExceptions.*;
+
/**
*
@@ -31,9 +24,16 @@
/**
* Check the integrity of the SVT header information.
* @param headers - headers to check
+ * @throws SvtEvioHeaderApvBufferAddressException
+ * @throws SvtEvioHeaderApvFrameCountException
+ * @throws SvtEvioHeaderMultisampleErrorBitException
+ * @throws SvtEvioHeaderApvReadErrorException
+ * @throws SvtEvioHeaderSkipCountException
+ * @throws SvtEvioHeaderOFErrorException
+ * @throws SvtEvioHeaderSyncErrorException
* @throws SvtEvioHeaderException
*/
- public static void checkSvtHeaders(List<SvtHeaderDataInfo> headers) throws SvtEvioHeaderException {
+ public static void checkSvtHeaders(List<SvtHeaderDataInfo> headers) throws SvtEvioHeaderApvBufferAddressException, SvtEvioHeaderApvFrameCountException, SvtEvioHeaderMultisampleErrorBitException, SvtEvioHeaderApvReadErrorException, SvtEvioHeaderSyncErrorException, SvtEvioHeaderOFErrorException, SvtEvioHeaderSkipCountException {
LOGGER.fine("check " + headers.size() + " headers ");
int[] bufferAddresses = new int[6];
int[] firstFrameCounts = new int[6];
@@ -156,7 +156,7 @@
}
- public static void checkSvtHeaderData(SvtHeaderDataInfo header) throws SvtEvioHeaderException {
+ public static void checkSvtHeaderData(SvtHeaderDataInfo header) throws SvtEvioHeaderSyncErrorException, SvtEvioHeaderOFErrorException, SvtEvioHeaderSkipCountException {
int tail = header.getTail();
LOGGER.fine("checkSvtHeaderData tail " + tail + "( " + Integer.toHexString(tail) + " ) " +
" errorbit " + Integer.toHexString(SvtEvioUtils.getSvtTailSyncErrorBit(tail)) +
Copied: java/trunk/record-util/src/main/java/org/hps/record/svt/SvtEvioExceptions.java (from r3807, java/trunk/evio/src/main/java/org/hps/evio/SvtEvioExceptions.java)
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SvtEvioExceptions.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/svt/SvtEvioExceptions.java Thu Oct 8 09:41:21 2015
@@ -1,7 +1,7 @@
/**
*
*/
-package org.hps.evio;
+package org.hps.record.svt;
/**
* @author Per Hansson Adrian <[log in to unmask]>
Copied: java/trunk/record-util/src/main/java/org/hps/record/svt/SvtEvioUtils.java (from r3807, java/trunk/evio/src/main/java/org/hps/evio/SvtEvioUtils.java)
=============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SvtEvioUtils.java (original)
+++ java/trunk/record-util/src/main/java/org/hps/record/svt/SvtEvioUtils.java Thu Oct 8 09:41:21 2015
@@ -1,4 +1,4 @@
-package org.hps.evio;
+package org.hps.record.svt;
/**
Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/EvioToLcio_LinkError.lcsim
=============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/EvioToLcio_LinkError.lcsim (original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/EvioToLcio_LinkError.lcsim Thu Oct 8 09:41:21 2015
@@ -6,7 +6,7 @@
-->
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="SvtMetaData"/>
+ <!--<driver name="SvtMetaData"/>-->
<!--<driver name="OLDLinkErrorDriver"/>-->
<!--<driver name="LinkErrorDriver"/>-->
<driver name="LCIOWriter"/>
@@ -28,7 +28,7 @@
<showPlots>False</showPlots>
</driver>
- <driver name="SvtMetaData" type="org.hps.users.phansson.SvtHeaderMetaData"/>
+ <driver name="SvtMetaData" type="org.hps.users.phansson.SvtHeaderMetaDataReaderDriver"/>
<driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
<writeOnlyCollections>SvtHeaders</writeOnlyCollections>
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderAnalysisDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderAnalysisDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderAnalysisDriver.java Thu Oct 8 09:41:21 2015
@@ -17,7 +17,7 @@
import org.hps.analysis.trigger.util.TriggerDataUtils;
import org.hps.evio.SvtEvioReader;
-import org.hps.evio.SvtEvioUtils;
+import org.hps.record.svt.SvtEvioUtils;
import org.hps.record.svt.SvtHeaderDataInfo;
import org.hps.util.BasicLogFormatter;
import org.lcsim.event.EventHeader;
Copied: java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaDataReaderDriver.java (from r3807, java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaData.java)
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaData.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/SvtHeaderMetaDataReaderDriver.java Thu Oct 8 09:41:21 2015
@@ -16,14 +16,14 @@
* @author Per Hansson Adrian <[log in to unmask]>
*
*/
-public class SvtHeaderMetaData extends Driver {
+public class SvtHeaderMetaDataReaderDriver extends Driver {
- private static Logger logger = LogUtil.create(SvtHeaderMetaData.class.getSimpleName(), new BasicLogFormatter(), Level.INFO);
+ private static Logger logger = LogUtil.create(SvtHeaderMetaDataReaderDriver.class.getSimpleName(), new BasicLogFormatter(), Level.INFO);
/**
*
*/
- public SvtHeaderMetaData() {
+ public SvtHeaderMetaDataReaderDriver() {
// TODO Auto-generated constructor stub
}
@@ -40,25 +40,18 @@
logger.info("NO SVT event header FLAG found");
}
-
- if( event.getIntegerParameters().containsKey("svt_event_headers")) {
- int[] svt_headers = event.getIntegerParameters().get("svt_event_headers");
- logger.info("found " + svt_headers.length + " SVT event headers:");
- for(int i=0; i< svt_headers.length; ++i) logger.info("header: " + svt_headers[i]);
- } else {
- logger.info("NO SVT event headers found");
- }
+ for(Map.Entry<String, int[]> entry : event.getIntegerParameters().entrySet()) {
+
+ if(entry.getKey().contains("svt_event_header_roc")) {
+ int[] svt_tails = entry.getValue();
+ logger.info("found SVT header \"" + Integer.toHexString(svt_tails[0]) + "\" for \"" + entry.getKey()+ "\"");
+ }
-
- if( event.getIntegerParameters().containsKey("svt_event_tails")) {
- int[] svt_tails = event.getIntegerParameters().get("svt_event_tails");
- logger.info("found " + svt_tails.length + " SVT event tails:");
- for(int i=0; i< svt_tails.length; ++i) logger.info("tail: " + svt_tails[i]);
- } else {
- logger.info("NO SVT event tails found");
- }
+ if(entry.getKey().contains("svt_event_tail_roc")) {
+ int[] svt_tails = entry.getValue();
+ logger.info("found SVT tail \"" + Integer.toHexString(svt_tails[0]) + "\" for \"" + entry.getKey()+ "\"");
+ }
- for(Map.Entry<String, int[]> entry : event.getIntegerParameters().entrySet()) {
if(entry.getKey().contains("svt_multisample_headers_roc")) {
int[] svt_tails = entry.getValue();
logger.info("found " + svt_tails.length + " SVT multisample headers for \"" + entry.getKey()+ "\":");
Modified: java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderAnalysisDriver.java
=============================================================================
--- java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderAnalysisDriver.java (original)
+++ java/trunk/users/src/main/java/org/hps/users/phansson/SvtOldHeaderAnalysisDriver.java Thu Oct 8 09:41:21 2015
@@ -17,7 +17,7 @@
import org.hps.analysis.trigger.util.TriggerDataUtils;
import org.hps.evio.SvtEvioReader;
-import org.hps.evio.SvtEvioUtils;
+import org.hps.record.svt.SvtEvioUtils;
import org.hps.util.BasicLogFormatter;
import org.lcsim.event.EventHeader;
import org.lcsim.event.GenericObject;
