 |
 |
fix some driver names I missed yesterday
diff -u -r1.8 -r1.9 --- ECalTriggerMonitoring.lcsim 6 Aug 2012 23:14:18 -0000 1.8 +++ ECalTriggerMonitoring.lcsim 1 Mar 2013 01:15:01 -0000 1.9 @@ -8,7 +8,7 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSEcalConditions"/>
+ <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalTriggerFilter"/>
<driver name="EcalClusterer"/>
@@ -25,8 +25,9 @@
-->
</execute>
<drivers>
- <driver name="HPSEcalConditions" type="org.lcsim.hps.recon.ecal.HPSEcalConditions"/> - <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalReadoutToTriggerConverterDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"> + </driver> + <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalReadoutToTriggerConverterDriver">
<rawCollectionName>EcalReadoutHits</rawCollectionName>
<integralWindow>35</integralWindow>
<applyBadCrystalMap>false</applyBadCrystalMap>
@@ -34,7 +35,7 @@
<tp>14.0</tp>
<truncateScale>1</truncateScale>
</driver>
- <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.HPSEcalTriggerFilterDriver">
+ <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.EcalTriggerFilterDriver">
<inputCollection>EcalCalHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
@@ -59,8 +60,7 @@
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="EcalClusterer" - type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">
+ <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.CTPEcalClusterer">
<ecalName>Ecal</ecalName>
<clusterWindow>32.0</clusterWindow>
<ecalCollectionName>EcalFilteredHits</ecalCollectionName>
diff -u -r1.2 -r1.3 --- StarterAnalysis.lcsim 8 Feb 2013 22:00:14 -0000 1.2 +++ StarterAnalysis.lcsim 1 Mar 2013 01:15:01 -0000 1.3 @@ -1,13 +1,13 @@
<!-- Example steering file for analysis. @author Sho Uemura <[log in to unmask]>
- @version $Id: StarterAnalysis.lcsim,v 1.2 2013/02/08 22:00:14 meeg Exp $
+ @version $Id: StarterAnalysis.lcsim,v 1.3 2013/03/01 01:15:01 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="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="StarterAnalysisDriver"/>
@@ -19,7 +19,7 @@
<eventInterval>1000</eventInterval>
</driver>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"/>
<driver name="StarterAnalysisDriver" type="org.lcsim.hps.examples.StarterAnalysisDriver">
</driver>
diff -u -r1.2 -r1.3 --- TwoTrackAnalysis.lcsim 16 Jan 2013 22:24:39 -0000 1.2 +++ TwoTrackAnalysis.lcsim 1 Mar 2013 01:15:01 -0000 1.3 @@ -16,7 +16,7 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
@@ -66,7 +66,7 @@
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
<!--<runNumber>-10</runNumber>-->
<runNumber>1351</runNumber>
</driver>
@@ -93,10 +93,10 @@
<includeMS>true</includeMS>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>
</driver>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
@@ -109,20 +109,20 @@
- <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.HPSEcalTriggerFilterDriver">
+ <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.EcalTriggerFilterDriver">
<inputCollection>EcalCorrectedHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
<driver name="EcalCTPClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">
+ type="org.lcsim.hps.recon.ecal.CTPEcalClusterer">
<ecalName>Ecal</ecalName>
<clusterWindow>32.0</clusterWindow>
<ecalCollectionName>EcalFilteredHits</ecalCollectionName>
</driver>
<driver name="EcalTrigger"
- type="org.lcsim.hps.recon.ecal.TestRunTriggerDriver">
+ type="org.lcsim.hps.readout.ecal.TestRunTriggerDriver">
<clusterCollectionName>EcalClusters</clusterCollectionName>
<deadTime>10</deadTime>
</driver>
diff -u -r1.14 -r1.15 --- ecal_fadc_bkgd.lcsim 25 Feb 2013 22:39:24 -0000 1.14 +++ ecal_fadc_bkgd.lcsim 1 Mar 2013 01:15:01 -0000 1.15 @@ -1,7 +1,7 @@
<!--
Example LCSim steering file to run trigger rate studies
@author Sho Uemura <[log in to unmask]>
- @version $Id: ecal_fadc_bkgd.lcsim,v 1.14 2013/02/25 22:39:24 meeg Exp $
+ @version $Id: ecal_fadc_bkgd.lcsim,v 1.15 2013/03/01 01:15:01 meeg Exp $
-->
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
@@ -42,7 +42,7 @@
<fixedGain>0.15</fixedGain> </driver> <driver name="EcalConverter"
- type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalRawHits</rawCollectionName> <ecalCollectionName>EcalCorrectedHits</ecalCollectionName> <gain>0.15</gain>
diff -u -r1.3 -r1.4 --- raw_triggers.lcsim 25 Feb 2013 22:39:24 -0000 1.3 +++ raw_triggers.lcsim 1 Mar 2013 01:15:01 -0000 1.4 @@ -1,7 +1,7 @@
<!--
steering file used for PAC 39 analysis
@author Sho Uemura <[log in to unmask]>
- @version $Id: raw_triggers.lcsim,v 1.3 2013/02/25 22:39:24 meeg Exp $
+ @version $Id: raw_triggers.lcsim,v 1.4 2013/03/01 01:15:01 meeg Exp $
-->
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
@@ -9,7 +9,7 @@
<printInputFiles>true</printInputFiles> </control> <execute>
-<!-- <driver name="HPSCalibrationDriver"/> -->
+<!-- <driver name="CalibrationDriver"/> -->
<!-- <driver name="EventMarkerDriver"/>--> <driver name="EcalClusterer"/> <driver name="EcalTrigger"/>
@@ -18,9 +18,9 @@
<driver name="ClockDriver"/> </execute> <drivers>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"/>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalHits</ecalCollectionName>
<addEMin>0.075</addEMin>
diff -u -r1.8 -r1.9 --- EcalGainDriver.lcsim 26 Nov 2012 18:12:35 -0000 1.8 +++ EcalGainDriver.lcsim 1 Mar 2013 01:15:01 -0000 1.9 @@ -7,7 +7,7 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<!-- <driver name="SVTBadChannelFilterDriver"/>-->
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
@@ -35,15 +35,15 @@
<ecalGainFileName>clusterlist.txt</ecalGainFileName>
</driver>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
<runNumber>1351</runNumber>
</driver>
<driver name="EcalRawConverter"
- type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
diff -u -r1.4 -r1.5 --- ECalTriggerWindowMonitoring.lcsim 23 May 2012 18:22:16 -0000 1.4 +++ ECalTriggerWindowMonitoring.lcsim 1 Mar 2013 01:15:01 -0000 1.5 @@ -8,7 +8,7 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSEcalConditions"/>
+ <driver name="CalibrationDriver"/>
<driver name="FADCConverter"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
@@ -26,11 +26,12 @@
-->
</execute>
<drivers>
- <driver name="HPSEcalConditions" type="org.lcsim.hps.recon.ecal.HPSEcalConditions"/>
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"> + </driver>
<driver name="FADCConverter" type="org.lcsim.hps.recon.ecal.FADCConverterDriver">
<threshold>80</threshold>
</driver>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<rawCollectionName>EcalIntegralHits</rawCollectionName>
<integralWindow>35</integralWindow>
<gain>1.0</gain>
@@ -66,7 +67,7 @@
<eventInterval>1</eventInterval>
</driver>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">
+ type="org.lcsim.hps.recon.ecal.CTPEcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
diff -u -r1.1 -r1.2 --- TestRunOfflineReconSeeVertexingPlots.lcsim 20 Dec 2012 22:15:21 -0000 1.1 +++ TestRunOfflineReconSeeVertexingPlots.lcsim 1 Mar 2013 01:15:01 -0000 1.2 @@ -2,7 +2,7 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
@@ -15,7 +15,7 @@
<driver name="TwoTrackAnalysis" />
</execute>
<drivers>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"/>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>100</eventInterval>
@@ -32,10 +32,10 @@
<stripMaxSeparation>20.0</stripMaxSeparation>
<stripTolerance>1.0</stripTolerance>
</driver>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
diff -u -r1.6 -r1.7 --- OfflineTrackingAxial.lcsim 25 Feb 2013 22:39:24 -0000 1.6 +++ OfflineTrackingAxial.lcsim 1 Mar 2013 01:15:01 -0000 1.7 @@ -18,11 +18,11 @@
</execute>
<drivers>
<driver name="EcalRawConverter"
- type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName> <ecalCollectionName>EcalCalHits</ecalCollectionName> </driver>
diff -u -r1.4 -r1.5 --- HPSTrackingDefaultsRecon.lcsim 14 Dec 2012 01:29:32 -0000 1.4 +++ HPSTrackingDefaultsRecon.lcsim 1 Mar 2013 01:15:01 -0000 1.5 @@ -9,7 +9,7 @@
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="SVTBadChannelFilterDriver"/>
<driver name="RawTrackerHitFitterDriver" />
@@ -22,7 +22,7 @@
<drivers>
<driver name="SVTBadChannelFilterDriver" type="org.lcsim.hps.recon.tracking.SVTBadChannelFilterDriver"/>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
<!-- <runNumber>1351</runNumber> -->
</driver>
diff -u -r1.4 -r1.5 --- ECalCalibration.lcsim 27 Aug 2012 22:42:19 -0000 1.4 +++ ECalCalibration.lcsim 1 Mar 2013 01:15:01 -0000 1.5 @@ -2,13 +2,12 @@
<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>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSEcalConditions"/>
+ <driver name="CalibrationDriver"/>
<driver name="EcalPedestalPlots"/> <!-- <driver name="EcalRawConverter"/>--> <!--
@@ -18,8 +17,9 @@
-->
</execute>
<drivers>
- <driver name="HPSEcalConditions" type="org.lcsim.hps.recon.ecal.HPSEcalConditions"/> - <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"> + </driver> + <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
</driver>
<driver name="EcalMonitoringPlots" type="org.lcsim.hps.monitoring.ecal.EcalMonitoringPlots">
<eventRefreshRate>100</eventRefreshRate>
diff -u -r1.15 -r1.16 --- ECalMonitoring.lcsim 20 Nov 2012 23:32:22 -0000 1.15 +++ ECalMonitoring.lcsim 1 Mar 2013 01:15:01 -0000 1.16 @@ -8,7 +8,7 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<!-- <driver name="EcalPedestalPlots"/>-->
@@ -26,8 +26,8 @@
</execute>
<drivers>
<driver name="RunControlDriver" type="org.lcsim.hps.monitoring.RunControlDriver"/>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/> - <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"/> + <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<!-- <threshold>150</threshold>-->
<applyBadCrystalMap>false</applyBadCrystalMap>
<!-- <dropBadFADC>true</dropBadFADC>-->
@@ -53,7 +53,7 @@
<eventInterval>1</eventInterval>
</driver>
<!-- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">-->
- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterer">
<!-- <clusterWindow>32.0</clusterWindow>-->
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
diff -u -r1.23 -r1.24 --- TestRunMonitoring.lcsim 26 Nov 2012 18:12:36 -0000 1.23 +++ TestRunMonitoring.lcsim 1 Mar 2013 01:15:01 -0000 1.24 @@ -8,7 +8,7 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="RawTrackerHitFitterDriver"/>
@@ -28,13 +28,13 @@
</execute>
<drivers>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"/>
<driver name="EcalRawConverter"
- type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
diff -u -r1.7 -r1.8 --- FakeHitTracking.lcsim 18 Dec 2012 23:49:29 -0000 1.7 +++ FakeHitTracking.lcsim 1 Mar 2013 01:15:01 -0000 1.8 @@ -3,7 +3,7 @@
<!--
Steering file used to run fake hit tracking
author: Per Hansson <[log in to unmask]>
- version: $Id: FakeHitTracking.lcsim,v 1.7 2012/12/18 23:49:29 omoreno Exp $
+ version: $Id: FakeHitTracking.lcsim,v 1.8 2013/03/01 01:15:01 meeg Exp $
-->
<inputFiles>
@@ -17,7 +17,7 @@
<execute>
<driver name="EventMarkerDriver" />
- <driver name="HPSCalibrationDriver" />
+ <driver name="CalibrationDriver" />
<driver name="CreateHelixTracks" />
<driver name="DataTrackerFakeHitDriver" />
<!-- SVT -->
@@ -47,7 +47,7 @@
<eventInterval>1</eventInterval>
</driver>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
</driver>
<driver name="CreateHelixTracks" type="org.lcsim.hps.users.phansson.ParticleHelixProducer">
diff -u -r1.17 -r1.18 --- OnlineTracking.lcsim 25 Feb 2013 22:39:24 -0000 1.17 +++ OnlineTracking.lcsim 1 Mar 2013 01:15:01 -0000 1.18 @@ -25,11 +25,11 @@
</execute>
<drivers>
<driver name="EcalRawConverter"
- type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName> <ecalCollectionName>EcalCalHits</ecalCollectionName> </driver>
diff -u -r1.9 -r1.10 --- TestRunEventDisplay.lcsim 26 Nov 2012 18:12:36 -0000 1.9 +++ TestRunEventDisplay.lcsim 1 Mar 2013 01:15:01 -0000 1.10 @@ -7,7 +7,7 @@
<printDriversDetailed>true</printDriversDetailed>
</control>
<execute>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="EventMarkerDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
@@ -22,7 +22,7 @@
</execute>
<drivers>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"/>
<driver name="SVTSimpleEventDisplay" type="org.lcsim.hps.monitoring.svt.SVTSimpleEventDisplay">
<singleEvent>true</singleEvent>
</driver>
@@ -30,11 +30,11 @@
type="org.lcsim.hps.monitoring.svt.SVTEventDisplay">
</driver>
<driver name="EcalRawConverter"
- type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
diff -u -r1.7 -r1.8 --- EcalGainDriverSim.lcsim 26 Nov 2012 18:12:36 -0000 1.7 +++ EcalGainDriverSim.lcsim 1 Mar 2013 01:15:01 -0000 1.8 @@ -7,7 +7,7 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
<driver name="EcalClusterer"/>
<driver name="EcalTriggerFilter"/>
@@ -30,22 +30,22 @@
<simTrigger>true</simTrigger>
</driver>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
</driver>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalEdepToTriggerConverterDriver">
+ <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalEdepToTriggerConverterDriver">
</driver>
- <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.HPSEcalTriggerFilterDriver">
+ <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.EcalTriggerFilterDriver">
<inputCollection>EcalTriggerHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
<driver name="EcalTriggerClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">
+ type="org.lcsim.hps.recon.ecal.CTPEcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalFilteredHits</ecalCollectionName>
<clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
</driver>
<driver name="EcalClusterer"
- type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
diff -u -r1.5 -r1.6 --- MPAlignment.lcsim 18 Dec 2012 23:49:29 -0000 1.5 +++ MPAlignment.lcsim 1 Mar 2013 01:15:01 -0000 1.6 @@ -12,7 +12,7 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
@@ -63,7 +63,7 @@
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
<runNumber>1351</runNumber>
</driver>
<driver name="EventMarkerDriver"
@@ -89,10 +89,10 @@
<includeMS>true</includeMS>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>
</driver>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
diff -u -r1.10 -r1.11 --- MultScatAna.lcsim 26 Nov 2012 18:12:36 -0000 1.10 +++ MultScatAna.lcsim 1 Mar 2013 01:15:01 -0000 1.11 @@ -8,7 +8,7 @@
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<!--
<driver name="RawTrackerHitSensorSetup"/>
@@ -79,7 +79,7 @@
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
<runNumber>1351</runNumber>
</driver>
<driver name="EventMarkerDriver"
@@ -104,10 +104,10 @@
<debug>false</debug>
<strategyResource>/org/lcsim/hps/recon/tracking/strategies/HPS-TestRun-v2-357.xml</strategyResource>
</driver>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
diff -u -r1.10 -r1.11 --- TestRunOfflineRecon.lcsim 28 Feb 2013 22:37:20 -0000 1.10 +++ TestRunOfflineRecon.lcsim 1 Mar 2013 01:15:01 -0000 1.11 @@ -2,7 +2,7 @@
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
@@ -13,7 +13,7 @@
<driver name="LCIOWriter"/>
</execute>
<drivers>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"/>
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver"/>
<driver name="EventMarkerDriver"
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
diff -u -r1.8 -r1.9 --- SVTMonitoring.lcsim 26 Nov 2012 18:12:36 -0000 1.8 +++ SVTMonitoring.lcsim 1 Mar 2013 01:15:01 -0000 1.9 @@ -2,7 +2,7 @@
<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="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="SVTPulsePlots"/>
@@ -30,14 +30,14 @@
<driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1</eventInterval>
</driver>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
<!-- <runNumber>17</runNumber> -->
</driver>
<driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup"/>
- <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
- <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalClusterer">
+ <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterer">
<ecalName>Ecal</ecalName>
<ecalCollectionName>EcalCalHits</ecalCollectionName>
</driver>
diff -u -r1.2 -r1.3 --- LCIOEventFilter.lcsim 15 Jan 2013 18:55:17 -0000 1.2 +++ LCIOEventFilter.lcsim 1 Mar 2013 01:15:01 -0000 1.3 @@ -10,7 +10,7 @@
</control>
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="RawTrackerHitSensorSetup"/>
<driver name="RawTrackerHitFitterDriver" />
<driver name="TrackerHitDriver"/>
@@ -29,7 +29,7 @@
type="org.lcsim.job.EventMarkerDriver">
<eventInterval>1000</eventInterval>
</driver>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
<runNumber>-10</runNumber>
<!-- <runNumber>1351</runNumber> -->
</driver>
diff -u -r1.11 -r1.12 --- HPSTrackingDefaults.lcsim 26 Nov 2012 18:12:36 -0000 1.11 +++ HPSTrackingDefaults.lcsim 1 Mar 2013 01:15:01 -0000 1.12 @@ -9,7 +9,7 @@
<execute>
<driver name="EventMarkerDriver"/>
- <driver name="HPSCalibrationDriver"/>
+ <driver name="CalibrationDriver"/>
<driver name="TrackerDigiDriver"/>
<driver name="HelicalTrackHitDriver"/>
<driver name="TrackerReconDriver"/>
@@ -17,7 +17,7 @@
</execute>
<drivers>
- <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+ <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.CalibrationDriver">
<!-- <runNumber>1351</runNumber> -->
</driver>
diff -u -r1.1 -r1.2 --- TestRunPairTrigger.lcsim 25 Feb 2013 22:39:25 -0000 1.1 +++ TestRunPairTrigger.lcsim 1 Mar 2013 01:15:01 -0000 1.2 @@ -14,7 +14,7 @@
<driver name="EventMarkerDriver"/>
<driver name="CalibrationDriver"/>
<driver name="EcalRawConverter"/>
-<!-- <driver name="HPSEcalRawConverterDriver"/> -->
+<!-- <driver name="EcalRawConverterDriver"/> -->
<!-- <driver name="EcalTriggerFilter"/> -->
<driver name="EcalTriggerClusterer"/>
<!-- <driver name="SimpleSVTReadout"/> -->
@@ -33,7 +33,7 @@
<truncateScale>1</truncateScale>
<constantGain>0.15</constantGain>
</driver>
-<!-- <driver name="HPSEcalRawConverterDriver" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+<!-- <driver name="EcalRawConverterDriver" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
<runBackwards>true</runBackwards>
<rawCollectionName>EcalReadoutHits</rawCollectionName>
<ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>
diff -u -r1.1 -r1.2 --- TestRunNoPileup.lcsim 25 Feb 2013 22:39:25 -0000 1.1 +++ TestRunNoPileup.lcsim 1 Mar 2013 01:15:01 -0000 1.2 @@ -27,7 +27,7 @@
<rawCollectionName>EcalReadoutHits</rawCollectionName>
<ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>
</driver>
- <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.HPSEcalTriggerFilterDriver">
+ <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.EcalTriggerFilterDriver">
<inputCollection>EcalTriggerHits</inputCollection>
<outputCollection>EcalFilteredHits</outputCollection>
</driver>
diff -u -r1.1 -r1.2 --- HPS2014ReadoutNoPileup.lcsim 25 Feb 2013 22:39:25 -0000 1.1 +++ HPS2014ReadoutNoPileup.lcsim 1 Mar 2013 01:15:01 -0000 1.2 @@ -1,7 +1,7 @@
<!-- Execute trigger+readout simulation without pileup (event by event) and write the results as an LCIO file. @author Sho Uemura <[log in to unmask]>
- @version $Id: HPS2014ReadoutNoPileup.lcsim,v 1.1 2013/02/25 22:39:25 meeg Exp $
+ @version $Id: HPS2014ReadoutNoPileup.lcsim,v 1.2 2013/03/01 01:15:01 meeg Exp $
-->
<lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">
@@ -31,7 +31,7 @@
<truncateScale>1</truncateScale>
<constantGain>0.15</constantGain>
</driver>
- <driver name="EcalReadoutConverterDriver" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">
+ <driver name="EcalReadoutConverterDriver" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver">
<runBackwards>true</runBackwards>
<rawCollectionName>EcalReadoutHits</rawCollectionName>
<ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>
Use REPLY-ALL to reply to list
To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1