3 added + 3 modified, total 6 files
java/trunk/integration-tests/src/test/java/org/hps
--- java/trunk/integration-tests/src/test/java/org/hps/EcalReadoutSimTest.java 2014-09-16 23:41:59 UTC (rev 1031)
+++ java/trunk/integration-tests/src/test/java/org/hps/EcalReadoutSimTest.java 2014-09-17 01:21:40 UTC (rev 1032)
@@ -86,9 +86,8 @@
static final String className = EcalReadoutSimTest.class.getSimpleName();
// Resource locations.
- static final String resourceDir = "/org/hps/ecalreadoutsim/";
- static final String steeringResource = resourceDir + className + ".lcsim";
- static final String triggeredEventsResource = resourceDir + "triggered_events.txt";
+ static final String steeringResource = "/org/hps/steering/test/EcalReadoutSimTest.lcsim";
+ static final String triggeredEventsResource = "/org/hps/test/EcalReadoutSimTest/triggered_events.txt";
// File information.
static final File inputFile = new File("/nfs/slac/g/hps3/data/testcase/ecal_readout_sim_input.slcio");
java/trunk/integration-tests/src/test/java/org/hps
--- java/trunk/integration-tests/src/test/java/org/hps/GenerateEcalReadoutSimData.java 2014-09-16 23:41:59 UTC (rev 1031)
+++ java/trunk/integration-tests/src/test/java/org/hps/GenerateEcalReadoutSimData.java 2014-09-17 01:21:40 UTC (rev 1032)
@@ -15,7 +15,7 @@
public class GenerateEcalReadoutSimData extends TestCase {
// This file is tridents, AP and backgrounds merged together into one event file.
- static String dataPath = "/nfs/slac/g/hps3/data/testcase/ap025mev_egs_tri_2.2gev_0.00125x0_200na_5e5b_30mr_001_SLIC-v04-00-00_Geant4-v10-00-02_QGSP_BERT_HPS-Proposal2014-v8-6pt6.slcio";
+ static String dataPath = "/nfs/slac/g/hps3/data/testcase/ap050mev_egs_tri_6.6gev_0.0025x0_450na_5e5b_30mr_001_SLIC-v04-00-00_Geant4-v10-00-02_QGSP_BERT_HPS-Proposal2014-v8-6pt6.slcio";
public void testGenerateReadoutSimData() throws Exception {
java/trunk/integration-tests/src/test/java/org/hps
--- java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java 2014-09-16 23:41:59 UTC (rev 1031)
+++ java/trunk/integration-tests/src/test/java/org/hps/MockDataReconTest.java 2014-09-17 01:21:40 UTC (rev 1032)
@@ -35,7 +35,7 @@
static final File reconFile = new File(outputFile.getAbsolutePath() + ".slcio");
static final File aidaFile = new File(outputFile.getAbsolutePath() + ".aida");
- static final String steeringResource = "/org/hps/mockdatarecon/MockDataReconTest.lcsim";
+ static final String steeringResource = "/org/hps/steering/test/MockDataReconTest.lcsim";
//static final String steeringResource = "/org/hps/steering/recon/HPS2014OfflineTruthRecon.lcsim";
// TODO: Get some values for these and add test assertions!
java/trunk/integration-tests/src/test/resources/org/hps/steering/test
--- java/trunk/integration-tests/src/test/resources/org/hps/steering/test/EcalReadoutSimTest.lcsim (rev 0)
+++ java/trunk/integration-tests/src/test/resources/org/hps/steering/test/EcalReadoutSimTest.lcsim 2014-09-17 01:21:40 UTC (rev 1032)
@@ -0,0 +1,77 @@
+<!--
+ Execute full trigger+readout simulation and write the results as an LCIO file.
+ @author Sho Uemura <[log in to unmask]>
+ @version $Id: HPS2014ReadoutToLcio.lcsim,v 1.2 2013/03/01 23:22:24 meeg Exp $
+-->
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+ <execute>
+<!--
+ <driver name="EventMarkerDriver"/>
+-->
+ <driver name="CalibrationDriver"/>
+ <driver name="EcalReadout"/>
+ <driver name="EcalConverter"/>
+ <driver name="EcalClusterer"/>
+ <driver name="EcalTrigger"/>
+ <driver name="SimpleSVTReadout"/>
+ <driver name="TestRunReconToLcio"/>
+ <driver name="ClockDriver"/>
+ <driver name="CleanupDriver"/>
+ </execute>
+
+ <drivers>
+<!--
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+ <eventInterval>1000</eventInterval>
+ </driver>
+-->
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
+<!-- <runNumber>1351</runNumber> -->
+ </driver>
+ <driver name="TestRunReconToLcio" type="org.hps.evio.TestRunTriggeredReconToLcio">
+ <outputFile>${outputFile}.slcio</outputFile>
+ </driver>
+
+ <driver name="EcalReadout" type="org.hps.readout.ecal.FADCEcalReadoutDriver">
+ <coincidenceWindow>1</coincidenceWindow>
+ <ecalName>Ecal</ecalName>
+ <ecalCollectionName>EcalHits</ecalCollectionName>
+ <ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
+ <addNoise>false</addNoise>
+<!-- <fixedGain>0.15</fixedGain>-->
+<!-- <debug>true</debug>-->
+ </driver>
+
+ <driver name="EcalConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+ <rawCollectionName>EcalRawHits</rawCollectionName>
+ <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+<!-- <gain>0.15</gain>-->
+ <applyBadCrystalMap>false</applyBadCrystalMap>
+ <use2014Gain>true</use2014Gain>
+<!-- <debug>true</debug>-->
+ </driver>
+
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.GTPEcalClusterer">
+ <ecalName>Ecal</ecalName>
+ <clusterWindow>1</clusterWindow>
+ <ecalCollectionName>EcalCorrectedHits</ecalCollectionName>
+ </driver>
+
+ <driver name="EcalTrigger" type="org.hps.readout.ecal.FADCTriggerDriver">
+ <clusterCollectionName>EcalClusters</clusterCollectionName>
+ <deadTime>10</deadTime>
+ <pairCoincidence>2</pairCoincidence>
+ <outputFileName>${outputFile}.triggers</outputFileName>
+ </driver>
+ <driver name="SimpleSVTReadout" type="org.hps.readout.svt.SimpleSvtReadout">
+ <addNoise>false</addNoise>
+ </driver>
+
+ <driver name="ClockDriver" type="org.hps.readout.ecal.ClockDriver"/>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+ <collectionNames>TrackerHits</collectionNames>
+ </driver>
+ </drivers>
+</lcsim>
+
java/trunk/integration-tests/src/test/resources/org/hps/steering/test
--- java/trunk/integration-tests/src/test/resources/org/hps/steering/test/MockDataReconTest.lcsim (rev 0)
+++ java/trunk/integration-tests/src/test/resources/org/hps/steering/test/MockDataReconTest.lcsim 2014-09-17 01:21:40 UTC (rev 1032)
@@ -0,0 +1,79 @@
+<!--
+ Offline reconstruction for 2014 (electron run) data.
+ @author Sho Uemura <[log in to unmask]>
+ @version $Id: HPS2014OfflineRecon.lcsim,v 1.7 2013/10/30 16:23:32 phansson Exp $
+-->
+<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
+ <control>
+ <numberOfEvents>100</numberOfEvents>
+ </control>
+ <execute>
+ <driver name="EventMarkerDriver"/>
+ <driver name="CalibrationDriver"/>
+ <driver name="RawTrackerHitSensorSetup"/>
+ <driver name="RawTrackerHitFitterDriver" />
+ <driver name="TrackerHitDriver"/>
+ <driver name="HelicalTrackHitDriver"/>
+ <driver name="TrackerReconDriver"/>
+ <driver name="EcalRawConverter" />
+ <driver name="EcalClusterer" />
+ <driver name="ReconParticle" />
+ <driver name="TrackDataDriver" />
+ <driver name="GBLDriver"/>
+ <driver name="LCIOWriter"/>
+ <driver name="CleanupDriver"/>
+ </execute>
+ <drivers>
+ <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver">
+ <!-- <runNumber>${runNumber}</runNumber>-->
+ </driver>
+ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
+ <eventInterval>10</eventInterval>
+ </driver>
+ <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
+ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
+ <fitAlgorithm>Analytic</fitAlgorithm>
+ <useTimestamps>false</useTimestamps>
+ <correctT0Shift>false</correctT0Shift>
+ <useTruthTime>true</useTruthTime>
+ <subtractTOF>true</subtractTOF>
+ </driver>
+ <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" />
+ <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
+ <debug>false</debug>
+ <clusterTimeCut>16.0</clusterTimeCut>
+ <maxSeperation>20.0</maxSeperation>
+ <tolerance>1.0</tolerance>
+ </driver>
+ <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
+ <strategyResource>HPS-Full.xml</strategyResource>
+ <debug>false</debug>
+ </driver>
+ <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver">
+ <debug>0</debug>
+ <isMC>false</isMC>
+ <gblFileName></gblFileName>
+ </driver>
+
+ <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver">
+ <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <use2014Gain>true</use2014Gain>
+ <useTimestamps>false</useTimestamps>
+ <useTruthTime>true</useTruthTime>
+ </driver>
+ <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterICBasic">
+ <ecalName>Ecal</ecalName>
+ <ecalCollectionName>EcalCalHits</ecalCollectionName>
+ <timeCut>true</timeCut>
+ </driver>
+ <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
+ </driver>
+ <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" />
+ <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver">
+ <outputFilePath>${outputFile}.slcio</outputFilePath>
+ <!--<writeOnlyCollections>blah</writeOnlyCollections>-->
+ </driver>
+ <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/>
+ </drivers>
+</lcsim>
java/trunk/integration-tests/src/test/resources/org/hps/test/EcalReadoutSimTest
--- java/trunk/integration-tests/src/test/resources/org/hps/test/EcalReadoutSimTest/triggered_events.txt (rev 0)
+++ java/trunk/integration-tests/src/test/resources/org/hps/test/EcalReadoutSimTest/triggered_events.txt 2014-09-17 01:21:40 UTC (rev 1032)
@@ -0,0 +1,1298 @@
+73
+323
+573
+681
+823
+1573
+1823
+2323
+2573
+2823
+3573
+3823
+4073
+4323
+4823
+5323
+5823
+6323
+6573
+6823
+7073
+7323
+8073
+8573
+8823
+9323
+9823
+10323
+10573
+11573
+11823
+12573
+12823
+13073
+13323
+13573
+14323
+14573
+14823
+15073
+15323
+15573
+15823
+16073
+16323
+16823
+17073
+17823
+18323
+18573
+18823
+19073
+19323
+19823
+20073
+20323
+20573
+20823
+21823
+22573
+22823
+23073
+23323
+23573
+23823
+24073
+24323
+24573
+25073
+25323
+25823
+26073
+26323
+26823
+27323
+27823
+28323
+28823
+29073
+29323
+29573
+29823
+30073
+30323
+30573
+31323
+32323
+32823
+33323
+33573
+33823
+34073
+34573
+34823
+35073
+35573
+36323
+36573
+36823
+37073
+37323
+37823
+38073
+38573
+38823
+39073
+39573
+40073
+40573
+41573
+42073
+42573
+43073
+43573
+44323
+44573
+45323
+46073
+46823
+47073
+47573
+47823
+48073
+48323
+48573
+48823
+49323
+49573
+51323
+51573
+52073
+52573
+53073
+53573
+54073
+54323
+54573
+55323
+55573
+55823
+56323
+57073
+57323
+57573
+58323
+58823
+59073
+60823
+61321
+61573
+62073
+62323
+62357
+62823
+63073
+63323
+63573
+63823
+64073
+64323
+64823
+65073
+65573
+65823
+66323
+66823
+67073
+67323
+67573
+68073
+68323
+68823
+69073
+69323
+69573
+70573
+70823
+71073
+71323
+71573
+71823
+72073
+72323
+72573
+73107
+73573
+74073
+74323
+75573
+75823
+76073
+76323
+76573
+77323
+77573
+77823
+78073
+78573
+78823
+79073
+79323
+79573
+80073
+80323
+80573
+81073
+82073
+82323
+82823
+83323
+83573
+83823
+84073
+84573
+84823
+85323
+85823
+86323
+87073
+88073
+88573
+88823
+89073
+89323
+89823
+90073
+90573
+90823
+91073
+91323
+91573
+92073
+92323
+92823
+93073
+93323
+93823
+94073
+94573
+94823
+95073
+95323
+95573
+95823
+96073
+96823
+97323
+97573
+97823
+98323
+98573
+98823
+99073
+99323
+99573
+99823
+100073
+100323
+100573
+100823
+101323
+101823
+102073
+102573
+102823
+103073
+103323
+103573
+104073
+104573
+104823
+105073
+105573
+105823
+106323
+108073
+108323
+108823
+109323
+109573
+109823
+110073
+110573
+111323
+111823
+112073
+112323
+112573
+113073
+113323
+113573
+113821
+114073
+114323
+114823
+115073
+116323
+116823
+117323
+118073
+118573
+118823
+119073
+119323
+119573
+119823
+120073
+120323
+120573
+120823
+121073
+121573
+121823
+122073
+122573
+122823
+123073
+123573
+124073
+124323
+124823
+125323
+125573
+125823
+126323
+126573
+126823
+127073
+127323
+127823
+128073
+128323
+128573
+128823
+129073
+129323
+129573
+130073
+131073
+131209
+131323
+131823
+132073
+132573
+132823
+133073
+133323
+133823
+134073
+134323
+134573
+135073
+135823
+136073
+136573
+136823
+138071
+138323
+138823
+139573
+139823
+140323
+140573
+141073
+141323
+141573
+141823
+142323
+142573
+142823
+143073
+143573
+143823
+144073
+144573
+144823
+145073
+145323
+145573
+145823
+146073
+146323
+146573
+146823
+147073
+147323
+147573
+148073
+148323
+148573
+148823
+149073
+149323
+149823
+150073
+150573
+150823
+151321
+151573
+151823
+152323
+152573
+152823
+153323
+153573
+153823
+154073
+154323
+154823
+155323
+155573
+155823
+156073
+156323
+156823
+157073
+157823
+158323
+158573
+159323
+159823
+160073
+160323
+160573
+161823
+162323
+162573
+162823
+163323
+163573
+163823
+164323
+164573
+164823
+165073
+165323
+165823
+166073
+166323
+166573
+166823
+167073
+167323
+167573
+167823
+168573
+168823
+169323
+169823
+170073
+170823
+171073
+171323
+171573
+172073
+172573
+173073
+173323
+173573
+173823
+174073
+174573
+174823
+175073
+175323
+175573
+176073
+176319
+176823
+177573
+178323
+178573
+178823
+179073
+179573
+179823
+180073
+180573
+180823
+181323
+181573
+181823
+182323
+182573
+183073
+183323
+183573
+183823
+184323
+184823
+185069
+185323
+185573
+185823
+186073
+186323
+186573
+187073
+187323
+187573
+187823
+188073
+188323
+188573
+189073
+189323
+190073
+190323
+191073
+191323
+191823
+192073
+192323
+192573
+193323
+193369
+193573
+194073
+194323
+194823
+195073
+195573
+196571
+197323
+197573
+198823
+199073
+199323
+199573
+200573
+201073
+201573
+201823
+202073
+202573
+203073
+203323
+204073
+204323
+204823
+205323
+205573
+205823
+206073
+207573
+207823
+208073
+208573
+208823
+209323
+209573
+210073
+210323
+210573
+210823
+211073
+211323
+211823
+212073
+212323
+212573
+212823
+213323
+213573
+213823
+214073
+214323
+214573
+215073
+215323
+216323
+216573
+216823
+217073
+217323
+218073
+218323
+218823
+219073
+219573
+219823
+220073
+220323
+220573
+220823
+221323
+221573
+221823
+222323
+222573
+222823
+223573
+224073
+225073
+226073
+226823
+227823
+228073
+228323
+228823
+229073
+229323
+229573
+229823
+230073
+230323
+230573
+230823
+231323
+231573
+232073
+232323
+232573
+233073
+233573
+233823
+234073
+234323
+234573
+235323
+236323
+236573
+236823
+237823
+238073
+238323
+238823
+239323
+239573
+240323
+240821
+241073
+241573
+241823
+242323
+242573
+242823
+243323
+243573
+244073
+244323
+244573
+245073
+245323
+245573
+246073
+246823
+247573
+248323
+249073
+249323
+249573
+249823
+250073
+250323
+250573
+251073
+251573
+251823
+252073
+252323
+252573
+252823
+253073
+253323
+253573
+253823
+254073
+254323
+254573
+255323
+255573
+255823
+256073
+256323
+256573
+257573
+257823
+258073
+258323
+258573
+261073
+261573
+261823
+262073
+262573
+262823
+263073
+263573
+264073
+264323
+264573
+264823
+265073
+265573
+265823
+266073
+266823
+267073
+267323
+267573
+267823
+268073
+268323
+268823
+269323
+270073
+270323
+270573
+270823
+271073
+271323
+271823
+272323
+272573
+272823
+273073
+273323
+273573
+273823
+274073
+274323
+274573
+274823
+275073
+275323
+275823
+276323
+276823
+277073
+277323
+277573
+277823
+278323
+279073
+279323
+279823
+280573
+281073
+281323
+281823
+282323
+282573
+282823
+283073
+283823
+284073
+284323
+284573
+284823
+285073
+286823
+287073
+287573
+287823
+288073
+288323
+288823
+289323
+290073
+290323
+291073
+291323
+291823
+292323
+292573
+293073
+293573
+293823
+293887
+294323
+294575
+294823
+295323
+295573
+295823
+296073
+296573
+296823
+297573
+297823
+298073
+298573
+298823
+299073
+300073
+300323
+300573
+300823
+301073
+301323
+301573
+302323
+302823
+303323
+303573
+303823
+304073
+304573
+304823
+305073
+305323
+306073
+306323
+306823
+307073
+307323
+307573
+307823
+308573
+309073
+309323
+309573
+310073
+310323
+310573
+310823
+311073
+311323
+311573
+311823
+312323
+312573
+312823
+313073
+313573
+313823
+314073
+314323
+314573
+314823
+315073
+315323
+315573
+315823
+316073
+316323
+316573
+316823
+317073
+317573
+318073
+318323
+318573
+319073
+319323
+319573
+319823
+320073
+320823
+321073
+321323
+321573
+322073
+322573
+322823
+323073
+323545
+323823
+324323
+324573
+325073
+325323
+326073
+326573
+326823
+327323
+327573
+327823
+328323
+328573
+328823
+329073
+329323
+329573
+329823
+330073
+330323
+331323
+331823
+332073
+332823
+333073
+333573
+333823
+334323
+334573
+334823
+335073
+335573
+335823
+336573
+337073
+337323
+337573
+337823
+338323
+338823
+339823
+340073
+340323
+340573
+340823
+341323
+341721
+341823
+342573
+342823
+343073
+343573
+343823
+344323
+344823
+345071
+345573
+345823
+346073
+346573
+346823
+347073
+347323
+347573
+347823
+348073
+348573
+348823
+349073
+349573
+349823
+350323
+350573
+350823
+351073
+352073
+352323
+352573
+352823
+353073
+353323
+353573
+354323
+354573
+354823
+355073
+355573
+355823
+356323
+356573
+357573
+358323
+358823
+359073
+359323
+359573
+359823
+360073
+360573
+361073
+361323
+362073
+362323
+363073
+363323
+363823
+364073
+364573
+364823
+365323
+365573
+365823
+366323
+366823
+367073
+367323
+367823
+368073
+368323
+368573
+369323
+369573
+369823
+370073
+370573
+370823
+371073
+371573
+371823
+372073
+372323
+372573
+373323
+373573
+374073
+374823
+375323
+375573
+376073
[truncated at 1000 lines; 302 more skipped]
SVNspam 0.1