Author: [log in to unmask] Date: Thu Feb 5 19:42:26 2015 New Revision: 2060 Log: Apply XML formatting to cleanup steering files. Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyError.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyMonitoring.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleSystemStatusMonitoring.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SensorOccupancyPlots.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyError.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyError.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyError.lcsim Thu Feb 5 19:42:26 2015 @@ -1,11 +1,10 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<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="DummyErrorDriver"/> - </execute> + <driver name="DummyErrorDriver" /> + </execute> <drivers> <driver name="DummyErrorDriver" type="org.hps.monitoring.drivers.example.DummyErrorDriver"> <throwProcess>true</throwProcess> </driver> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyMonitoring.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyMonitoring.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/DummyMonitoring.lcsim Thu Feb 5 19:42:26 2015 @@ -2,14 +2,13 @@ This steering file only prints the event numbers for LCIO events processed in the monitoring application. --> -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<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"/> - </execute> - <drivers> + <driver name="EventMarkerDriver" /> + </execute> + <drivers> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> </driver> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalBasicMonitoring.lcsim Thu Feb 5 19:42:26 2015 @@ -9,12 +9,10 @@ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> </driver> - <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver"> <applyBadCrystalMap>false</applyBadCrystalMap> <use2014Gain>false</use2014Gain> </driver> - <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver"> <verbose>false</verbose> <logLevel>WARNING</logLevel> @@ -24,7 +22,6 @@ <inputHitCollectionName>EcalCalHits</inputHitCollectionName> <outputClusterCollectionName>EcalClusters</outputClusterCollectionName> </driver> - <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.BasicMonitoringPlotsDriver" /> </drivers> </lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalLedCommissioning.lcsim Thu Feb 5 19:42:26 2015 @@ -1,13 +1,12 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> <control> <printDriversDetailed>true</printDriversDetailed> - </control> + </control> <execute> - <driver name="EventMarkerDriver"/> - <driver name="EcalRawConverter"/> - <driver name="EcalEventDisplay"/> <!-- Ecal event display --> - </execute> + <driver name="EventMarkerDriver" /> + <driver name="EcalRawConverter" /> + <driver name="EcalEventDisplay" /> <!-- Ecal event display --> + </execute> <drivers> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> @@ -25,4 +24,4 @@ <eventRefreshRate>5</eventRefreshRate> </driver> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalMonitoring.lcsim Thu Feb 5 19:42:26 2015 @@ -1,25 +1,23 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> <control> <numberOfEvents>-1</numberOfEvents> <printInputFiles>true</printInputFiles> <printDriversDetailed>true</printDriversDetailed> - </control> + </control> <execute> - <driver name="EventMarkerDriver"/> - <driver name="EcalRawConverter"/> - <driver name="EcalClusterer"/> - <driver name="EcalMonitoringPlots"/> - <driver name="EcalHitPlots"/> - <driver name="EcalWindowPlots"/> - </execute> + <driver name="EventMarkerDriver" /> + <driver name="EcalRawConverter" /> + <driver name="EcalClusterer" /> + <driver name="EcalMonitoringPlots" /> + <driver name="EcalHitPlots" /> + <driver name="EcalWindowPlots" /> + </execute> <drivers> <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver"> <applyBadCrystalMap>false</applyBadCrystalMap> <use2014Gain>false</use2014Gain> </driver> - <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver"> <verbose>false</verbose> <logLevel>WARNING</logLevel> @@ -29,22 +27,18 @@ <inputHitCollectionName>EcalCalHits</inputHitCollectionName> <outputClusterCollectionName>EcalClusters</outputClusterCollectionName> </driver> - <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots"> <inputCollection>EcalCalHits</inputCollection> <eventRefreshRate>100</eventRefreshRate> </driver> - <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots"> - <inputCollection>EcalCalHits</inputCollection> + <inputCollection>EcalCalHits</inputCollection> </driver> - <driver name="EcalWindowPlots" type="org.hps.monitoring.ecal.plots.EcalWindowPlotsXY"> <inputCollection>EcalReadoutHits</inputCollection> </driver> - <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> - </driver> + </driver> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerMonitoring.lcsim Thu Feb 5 19:42:26 2015 @@ -1,14 +1,13 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> <control> <printInputFiles>true</printInputFiles> <printDriversDetailed>true</printDriversDetailed> - </control> + </control> <execute> - <driver name="EventMarkerDriver"/> - <driver name="EcalRawConverter"/> - <driver name="EcalTriggerFilter"/> - <driver name="EcalClusterer"/> + <driver name="EventMarkerDriver" /> + <driver name="EcalRawConverter" /> + <driver name="EcalTriggerFilter" /> + <driver name="EcalClusterer" /> <!-- <driver name="EcalPedestalPlots"/>--> <!-- <driver name="EcalMonitoringPlots"/>--> <!-- <driver name="EcalHitPlots"/>--> @@ -20,7 +19,7 @@ <driver name="EcalDaqPlots"/> --> <!--<driver name="AidaSaveDriver"/>--> - </execute> + </execute> <drivers> <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalReadoutToTriggerConverterDriver"> <rawCollectionName>EcalReadoutHits</rawCollectionName> @@ -33,7 +32,7 @@ <driver name="EcalTriggerFilter" type="org.hps.recon.ecal.EcalTriggerFilterDriver"> <inputCollection>EcalCalHits</inputCollection> <outputCollection>EcalFilteredHits</outputCollection> - </driver> + </driver> <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots"> </driver> <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots"> @@ -49,9 +48,8 @@ <maxE>10000</maxE> <eventRefreshRate>100</eventRefreshRate> </driver> ---> - <driver name="EventMarkerDriver" - type="org.lcsim.job.EventMarkerDriver"> +--> + <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> </driver> <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver"> @@ -68,9 +66,9 @@ <clusterEnergyCut>1280</clusterEnergyCut> <eventRefreshRate>10000</eventRefreshRate> </driver> - --> + --> <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver"> <outputFileName>triggerPlots</outputFileName> </driver> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ECalTriggerWindowMonitoring.lcsim Thu Feb 5 19:42:26 2015 @@ -54,7 +54,7 @@ <inputCollection>EcalCalHits</inputCollection> <eventRefreshRate>100</eventRefreshRate> </driver> ---> +--> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> </driver> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringFinal.lcsim Thu Feb 5 19:42:26 2015 @@ -7,32 +7,27 @@ </control> <execute> <!-- <driver name="EventMarkerDriver"/> --> - <driver name="EcalRawConverter" /> <driver name="EcalClusterer" /> <driver name="EcalMonitoringPlots" /> <!-- General plots --> <driver name="EcalHitPlots" /> <!-- Single hit distributions --> <driver name="EcalClusterPlots" /> <!-- Clusters distributions --> <driver name="EcalDaqPlots" /> <!-- DAQ Plots --> - <driver name="EcalEventDisplay" /> <!-- Ecal event display --> - + <driver name="EcalEventDisplay" /> <!-- Ecal event display --> <!-- <driver name="EcalWindowPlots"/> --> <!-- <driver name="EcalEvsX"/> --> <!-- <driver name="TriggerPlots"/> --> <!-- <driver name="EcalEventMonitor"/> --> <!-- <driver name="AidaSaveDriver"/> --> - </execute> - + </execute> <drivers> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> </driver> - <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver"> <applyBadCrystalMap>false</applyBadCrystalMap> - <use2014Gain>false</use2014Gain> + <use2014Gain>false</use2014Gain> </driver> - <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver"> <verbose>false</verbose> <logLevel>WARNING</logLevel> @@ -42,28 +37,23 @@ <inputHitCollectionName>EcalCalHits</inputHitCollectionName> <outputClusterCollectionName>EcalClusters</outputClusterCollectionName> </driver> - <driver name="EcalMonitoringPlots" type="org.hps.monitoring.ecal.plots.EcalMonitoringPlots"> <inputCollection>EcalCalHits</inputCollection> <eventRefreshRate>5</eventRefreshRate> <accumulateHits>false</accumulateHits> </driver> - <driver name="EcalHitPlots" type="org.hps.monitoring.ecal.plots.EcalHitPlots"> <inputCollection>EcalCalHits</inputCollection> <maxE>2.0</maxE> <logScale>false</logScale> </driver> - <driver name="EcalClusterPlots" type="org.hps.monitoring.ecal.plots.EcalClusterPlots"> <maxE>2.0</maxE> <logScale>false</logScale> </driver> - <driver name="EcalDaqPlots" type="org.hps.monitoring.ecal.plots.EcalDaqPlots"> <inputCollection>EcalCalHits</inputCollection> </driver> - <driver name="EcalEventDisplay" type="org.hps.monitoring.ecal.plots.EcalEventDisplay"> <inputCollection>EcalCalHits</inputCollection> <inputCollectionRaw>EcalReadoutHits</inputCollectionRaw> @@ -72,8 +62,7 @@ <maxEch>2.0</maxEch> <minEch>0.005</minEch> <eventRefreshRate>1</eventRefreshRate> - </driver> - + </driver> <!--<driver name="EcalClusterer" type="org.hps.recon.ecal.HPSEcalCTPClusterer"> --> <!-- <driver name="EcalEvsX" type="org.hps.monitoring.ecal.EcalEvsX"> @@ -98,4 +87,4 @@ <outputFileName>triggerEPlots</outputFileName> </driver> --> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/EcalMonitoringTest.lcsim Thu Feb 5 19:42:26 2015 @@ -1,15 +1,14 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<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="EcalMonitoringTestDriver"/> - </execute> +<!-- <driver name="EventMarkerDriver"/> --> + <driver name="EcalMonitoringTestDriver" /> + </execute> <drivers> <!-- <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> </driver> ---> - <driver name="EcalMonitoringTestDriver" type="org.hps.monitoring.drivers.example.EcalMonitoringTestDriver"/> +--> + <driver name="EcalMonitoringTestDriver" type="org.hps.monitoring.drivers.example.EcalMonitoringTestDriver" /> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleMonitoringPlots.lcsim Thu Feb 5 19:42:26 2015 @@ -1,9 +1,8 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> - <execute> +<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="EcalRawConverter" /> <driver name="ReconClusterer" /> - <driver name="ExamplePlotDriver"/> + <driver name="ExamplePlotDriver" /> </execute> <drivers> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> @@ -14,12 +13,12 @@ <use2014Gain>false</use2014Gain> <useTimestamps>false</useTimestamps> <useTruthTime>false</useTruthTime> - </driver> + </driver> <driver name="ReconClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver"> <logLevel>WARNING</logLevel> <outputClusterCollectionName>EcalClusters</outputClusterCollectionName> <hitEnergyThreshold>0.01</hitEnergyThreshold> - <seedEnergyThreshold>0.100</seedEnergyThreshold> + <seedEnergyThreshold>0.100</seedEnergyThreshold> <clusterEnergyThreshold>0.200</clusterEnergyThreshold> <useTimeCut>false</useTimeCut> <writeRejectedHitCollection>false</writeRejectedHitCollection> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleSystemStatusMonitoring.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleSystemStatusMonitoring.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/ExampleSystemStatusMonitoring.lcsim Thu Feb 5 19:42:26 2015 @@ -1,11 +1,10 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<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="BasicHitMonitoringDriver"/> - </execute> + <driver name="EventMarkerDriver" /> + <driver name="BasicHitMonitoringDriver" /> + </execute> <drivers> - <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"/> - <driver name="BasicHitMonitoringDriver" type="org.hps.monitoring.subsys.svt.BasicHitMonitoringDriver"/> + <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver" /> + <driver name="BasicHitMonitoringDriver" type="org.hps.monitoring.subsys.svt.BasicHitMonitoringDriver" /> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/OnlineTracking.lcsim Thu Feb 5 19:42:26 2015 @@ -1,5 +1,4 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> <control> <numberOfEvents>-1</numberOfEvents> <printInputFiles>false</printInputFiles> @@ -25,7 +24,6 @@ <ecalCollectionName>EcalCalHits</ecalCollectionName> <use2014Gain>false</use2014Gain> </driver> - <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver"> <verbose>false</verbose> <logLevel>WARNING</logLevel> @@ -35,67 +33,54 @@ <inputHitCollectionName>EcalCalHits</inputHitCollectionName> <outputClusterCollectionName>EcalClusters</outputClusterCollectionName> </driver> - <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver"> <rawHitCollectionName>SVTRawTrackerHits</rawHitCollectionName> <fittedHitCollectionName>SVTFittedRawTrackerHits</fittedHitCollectionName> <fitAlgorithm>Analytic</fitAlgorithm> </driver> - <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver"> <clusterSeedThreshold>3.0</clusterSeedThreshold> <clusterNeighborThreshold>3.0</clusterNeighborThreshold> <clusterThreshold>3.0</clusterThreshold> </driver> - <driver name="SVTEventPlots" type="org.hps.monitoring.drivers.svt.SVTEventInfo"> <outputPlots>svtEventInfoPlots.aida</outputPlots> </driver> - <driver name="SVTHitRecoPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots"> <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName> <outputPlots>svtHitRecoPlots.aida</outputPlots> </driver> - <driver name="SVTHitCorrPlots" type="org.hps.monitoring.drivers.svt.SVTHitRecoCorrelations"> <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName> <outputPlots>svtHitRecoCorrPlots.aida</outputPlots> </driver> - <driver name="SVTPulsePlots" type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots"> <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> <outputPlots>svtPulsePlots.aida</outputPlots> </driver> - <driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver"> <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> <eventRefreshRate>100</eventRefreshRate> </driver> - <driver name="SVTEventDisplay" type="org.hps.monitoring.drivers.svt.SVTEventDisplay" /> - <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1000</eventInterval> </driver> - <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver"> <debug>false</debug> <maxSeperation>20.0</maxSeperation> <tolerance>1.0</tolerance> </driver> - <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver"> <debug>false</debug> <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource> </driver> - <driver name="TrackingReconstructionPlots" type="org.hps.monitoring.drivers.svt.TrackingReconstructionPlots"> <outputPlots>trackingPlots.aida</outputPlots> </driver> - <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"> <collectionNames>TrackerHits SVTRawTrackerHits SVTFittedRawTrackerHits StripClusterer_SiTrackerHitStrip1D</collectionNames> </driver> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTBasicMonitoring.lcsim Thu Feb 5 19:42:26 2015 @@ -1,16 +1,15 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<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="EcalRawConverter"/> - <driver name="EcalClusterer"/> - <driver name="RawTrackerHitFitterDriver"/> - <driver name="TrackerHitDriver"/> - <driver name="HelicalTrackHitDriver"/> - <driver name="TrackerReconDriver"/> - <driver name="SVTBasicMonitoringPlots"/> - <driver name="CleanupDriver"/> - </execute> + <driver name="EventMarkerDriver" /> + <driver name="EcalRawConverter" /> + <driver name="EcalClusterer" /> + <driver name="RawTrackerHitFitterDriver" /> + <driver name="TrackerHitDriver" /> + <driver name="HelicalTrackHitDriver" /> + <driver name="TrackerReconDriver" /> + <driver name="SVTBasicMonitoringPlots" /> + <driver name="CleanupDriver" /> + </execute> <drivers> <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver"> <ecalCollectionName>EcalCalHits</ecalCollectionName> @@ -27,7 +26,7 @@ <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver"> <fitAlgorithm>Analytic</fitAlgorithm> </driver> - <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver"/> + <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" /> <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"> <collectionNames>TrackerHits</collectionNames> </driver> @@ -49,4 +48,4 @@ <!-- <singleEvent>false</singleEvent> --> </driver> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SVTMonitoring.lcsim Thu Feb 5 19:42:26 2015 @@ -2,32 +2,28 @@ <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="RawTrackerHitSensorSetup"/> - <driver name="SVTPulsePlots"/> - + <driver name="RawTrackerHitSensorSetup" /> + <driver name="SVTPulsePlots" /> <driver name="RawTrackerHitFitterDriver" /> - <driver name="SVTPulseFitPlots"/> + <driver name="SVTPulseFitPlots" /> <!-- <driver name="SVTMonitoringPlots"/>--> - <driver name="TrackerHitDriver" /> - <driver name="SVTHitRecoPlots"/> - + <driver name="SVTHitRecoPlots" /> <driver name="HelicalTrackHitDriver" /> <driver name="TrackerReconDriver" /> <!-- <driver name="SVTSimpleEventDisplay"/>--> <!-- <driver name="TrackTimePlots"/>--> - <driver name="EcalRawConverter" /> <driver name="EcalClusterer" /> <driver name="TrackingReconstructionPlots" /> - <driver name="CleanupDriver"/> - <driver name="AidaSaveDriver"/> + <driver name="CleanupDriver" /> + <driver name="AidaSaveDriver" /> </execute> <drivers> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> </driver> - <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/> + <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" /> <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver"> <ecalCollectionName>EcalCalHits</ecalCollectionName> <use2014Gain>false</use2014Gain> @@ -45,9 +41,8 @@ <fitAlgorithm>Analytic</fitAlgorithm> <correctT0Shift>true</correctT0Shift> </driver> - <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" /> - <driver name="HelicalTrackHitDriver" - type="org.hps.recon.tracking.HelicalTrackHitDriver"> + <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" /> + <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver"> <debug>false</debug> <maxSeperation>20.0</maxSeperation> <tolerance>1.0</tolerance> @@ -65,24 +60,21 @@ </driver> <driver name="SVTMonitoringPlots" type="org.hps.monitoring.drivers.svt.SVTMonitoringPlots"> </driver> - <driver name="SVTPulseFitPlots" - type="org.hps.monitoring.drivers.svt.SVTPulseFitPlots"> - <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName> - </driver> - <driver name="SVTPulsePlots" - type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots"> - <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> - </driver> - <driver name="SVTHitRecoPlots" - type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots"> - <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName> + <driver name="SVTPulseFitPlots" type="org.hps.monitoring.drivers.svt.SVTPulseFitPlots"> + <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName> </driver> - <driver name="TrackTimePlots" type="org.hps.monitoring.drivers.svt.TrackTimePlots"/> + <driver name="SVTPulsePlots" type="org.hps.monitoring.drivers.svt.SVTHitPulsePlots"> + <rawTrackerHitCollectionName>SVTRawTrackerHits</rawTrackerHitCollectionName> + </driver> + <driver name="SVTHitRecoPlots" type="org.hps.monitoring.drivers.svt.SVTHitReconstructionPlots"> + <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName> + </driver> + <driver name="TrackTimePlots" type="org.hps.monitoring.drivers.svt.TrackTimePlots" /> <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"> <collectionNames>TrackerHits</collectionNames> - </driver> + </driver> <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver"> <outputFileName>svtmon_plots2</outputFileName> </driver> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SensorOccupancyPlots.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SensorOccupancyPlots.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/monitoring/SensorOccupancyPlots.lcsim Thu Feb 5 19:42:26 2015 @@ -1,9 +1,8 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<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="SVTOccupancyPlots"/> - </execute> + <driver name="EventMarkerDriver" /> + <driver name="SVTOccupancyPlots" /> + </execute> <drivers> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> @@ -11,5 +10,5 @@ <driver name="SVTOccupancyPlots" type="org.hps.monitoring.drivers.svt.SensorOccupancyPlotsDriver"> <eventRefreshRate>1</eventRefreshRate> </driver> - </drivers> -</lcsim> + </drivers> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/GBLReco.lcsim Thu Feb 5 19:42:26 2015 @@ -22,45 +22,35 @@ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>100</eventInterval> </driver> - <driver name="GBLDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver"> <debug>0</debug> <isMC>${isMC}</isMC> <gblFileName>gblinput.txt</gblFileName> </driver> - <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" /> - <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" /> <!-- Reconstruction drivers below --> <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" /> - <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" /> - <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver"> <fitAlgorithm>Analytic</fitAlgorithm> <correctT0Shift>false</correctT0Shift> </driver> - <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" /> - <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver"> <debug>false</debug> <maxSeperation>20.0</maxSeperation> <tolerance>1.0</tolerance> </driver> - <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver"> <debug>false</debug> <strategyResource>/org/hps/recon/tracking/strategies/HPS-TestRun-357.xml</strategyResource> <!-- <strategyResource>/org/hps/recon/tracking/strategies/${strategy}.xml</strategyResource>--> </driver> - <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver"> <ecalCollectionName>EcalCalHits</ecalCollectionName> </driver> - <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.GTPOnlineClusterDriver"> <verbose>false</verbose> <logLevel>WARNING</logLevel> @@ -70,7 +60,6 @@ <inputHitCollectionName>EcalCalHits</inputHitCollectionName> <outputClusterCollectionName>EcalClusters</outputClusterCollectionName> </driver> - <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" /> </drivers> </lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineRecon.lcsim Thu Feb 5 19:42:26 2015 @@ -4,66 +4,53 @@ --> <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="EventMarkerDriver" /> <driver name="SvtSensorSetup" /> - <driver name="RawTrackerHitSensorSetup"/> + <driver name="RawTrackerHitSensorSetup" /> <driver name="BadChannelFilter" /> <driver name="RawTrackerHitFitterDriver" /> - <driver name="TrackerHitDriver"/> - <driver name="HelicalTrackHitDriver"/> - <driver name="TrackerReconDriver"/> + <driver name="TrackerHitDriver" /> + <driver name="HelicalTrackHitDriver" /> + <driver name="TrackerReconDriver" /> <driver name="EcalRawConverter" /> <driver name="EcalClusterer" /> - <driver name="ReconParticle" /> - <driver name="TrackDataDriver" /> - <driver name="LCIOWriter"/> - <driver name="CleanupDriver"/> - </execute> - <drivers> + <driver name="ReconParticle" /> + <driver name="TrackDataDriver" /> + <driver name="LCIOWriter" /> + <driver name="CleanupDriver" /> + </execute> + <drivers> <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" /> - <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>100</eventInterval> </driver> - - <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/> - - <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" /> - + <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" /> + <driver name="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" /> <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver"> <fitAlgorithm>Analytic</fitAlgorithm> <correctT0Shift>true</correctT0Shift> </driver> - <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" /> - <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver"> <debug>false</debug> <maxSeperation>20.0</maxSeperation> <tolerance>1.0</tolerance> </driver> - <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver"> <debug>false</debug> - <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource> + <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-All.xml</strategyResource> </driver> - <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver"> <ecalCollectionName>EcalCalHits</ecalCollectionName> </driver> - - <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver"> + <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver"> <clustererName>LegacyClusterer</clustererName> </driver> - - <driver name="ReconParticle" type="org.hps.recon.particle.TestRunReconParticleDriver" /> - + <driver name="ReconParticle" type="org.hps.recon.particle.TestRunReconParticleDriver" /> <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver" /> - <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver"> <outputFilePath>${outputFile}.slcio</outputFilePath> </driver> - - <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/> + <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" /> </drivers> -</lcsim> +</lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/TestRunOfflineReconTwoTrkFilter.lcsim Thu Feb 5 19:42:26 2015 @@ -1,57 +1,46 @@ -<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" - xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd"> +<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="EventMarkerDriver" /> <driver name="SvtSensorSetup" /> - <driver name="RawTrackerHitSensorSetup"/> + <driver name="RawTrackerHitSensorSetup" /> <driver name="RawTrackerHitFitterDriver" /> - <driver name="TrackerHitDriver"/> - <driver name="HelicalTrackHitDriver"/> - <driver name="TrackerReconDriver"/> + <driver name="TrackerHitDriver" /> + <driver name="HelicalTrackHitDriver" /> + <driver name="TrackerReconDriver" /> <driver name="EcalRawConverter" /> <driver name="EcalClusterer" /> - <driver name="TwoTrackFilter"/> - <driver name="CleanupDriver"/> - </execute> - <drivers> + <driver name="TwoTrackFilter" /> + <driver name="CleanupDriver" /> + </execute> + <drivers> <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" /> - <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1000</eventInterval> </driver> - - <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/> - + <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" /> <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver"> <fitAlgorithm>Analytic</fitAlgorithm> <correctT0Shift>true</correctT0Shift> </driver> - <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver" /> - <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver"> <debug>false</debug> <maxSeperation>20.0</maxSeperation> <tolerance>1.0</tolerance> </driver> - <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver"> <debug>false</debug> </driver> - <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver"> <ecalCollectionName>EcalCalHits</ecalCollectionName> </driver> - - <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver"> + <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ClusterDriver"> <clustererName>LegacyClusterer</clustererName> </driver> - <driver name="TwoTrackFilter" type="org.hps.util.TwoTrackFilterDriver"> <debug>false</debug> <outputFilePath>${outputFile}</outputFilePath> </driver> - - <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/> + <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver" /> </drivers> -</lcsim> +</lcsim>