Commit in hps-java/src/main/resources/org/lcsim/hps/steering on MAIN
HPSTestRunNoPileup.lcsim+5-71.3 -> 1.4
HPSTestRunPairTrigger.lcsim+8-71.3 -> 1.4
ecal_fadc_bkgd.lcsim+5-121.12 -> 1.13
SVTMonitoring.lcsim+15-31.5 -> 1.6
ECalMonitoring.lcsim+3-11.14 -> 1.15
+36-30
5 modified files
update steering files to remove crufty old drivers
hps-java/src/main/resources/org/lcsim/hps/steering
HPSTestRunNoPileup.lcsim 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- HPSTestRunNoPileup.lcsim	27 Sep 2012 01:08:13 -0000	1.3
+++ HPSTestRunNoPileup.lcsim	20 Nov 2012 23:32:22 -0000	1.4
@@ -9,7 +9,7 @@

         <driver name="EventMarkerDriver"/>
         <driver name="HPSCalibrationDriver"/>
         <driver name="EcalRawConverter"/>

-        <driver name="HPSEcalConverterAtoDDriver"/>

+        <driver name="HPSEcalRawConverterDriver"/>

         <driver name="EcalTriggerFilter"/>
         <driver name="EcalTriggerClusterer"/>
         <driver name="SimpleSVTReadout"/>

@@ -22,7 +22,7 @@

         <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.HPSEcalEdepToTriggerConverterDriver">
             <readoutCollection>EcalReadoutAnalogHits</readoutCollection>
         </driver>

-        <driver name="HPSEcalConverterAtoDDriver" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">

+        <driver name="HPSEcalRawConverterDriver" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">

             <runBackwards>true</runBackwards>
             <rawCollectionName>EcalReadoutHits</rawCollectionName>
             <ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>

@@ -30,15 +30,13 @@

         <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.HPSEcalTriggerFilterDriver">
             <inputCollection>EcalTriggerHits</inputCollection>
             <outputCollection>EcalFilteredHits</outputCollection>

-        </driver>        
-        <driver name="EcalTriggerClusterer"
-                type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">

+        </driver>
+        <driver name="EcalTriggerClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">

             <ecalName>Ecal</ecalName>
             <ecalCollectionName>EcalFilteredHits</ecalCollectionName>
             <clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
         </driver>

-        <driver name="EcalTrigger"
-                        type="org.lcsim.hps.recon.ecal.TestRunTriggerDriver">

+        <driver name="EcalTrigger" type="org.lcsim.hps.recon.ecal.TestRunTriggerDriver">

             <clusterCollectionName>EcalTriggerClusters</clusterCollectionName>
             <deadTime>0</deadTime>
             <lcioFile>${outputFile}</lcioFile>
hps-java/src/main/resources/org/lcsim/hps/steering
HPSTestRunPairTrigger.lcsim 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- HPSTestRunPairTrigger.lcsim	2 Nov 2012 21:40:31 -0000	1.3
+++ HPSTestRunPairTrigger.lcsim	20 Nov 2012 23:32:22 -0000	1.4
@@ -14,14 +14,14 @@

         <driver name="EventMarkerDriver"/>
         <driver name="HPSCalibrationDriver"/>
         <driver name="EcalRawConverter"/>

-<!--        <driver name="HPSEcalConverterAtoDDriver"/> -->

+<!--        <driver name="HPSEcalRawConverterDriver"/> -->

 <!--        <driver name="EcalTriggerFilter"/> -->
         <driver name="EcalTriggerClusterer"/>
 <!--        <driver name="SimpleSVTReadout"/> -->
         <driver name="EcalTrigger"/>
         <driver name="ClockDriver"/>

-        <driver name="MCParticlePlots"/>
-        <driver name="TriggerTurnOnAnalysis"/>

+<!--        <driver name="MCParticlePlots"/>-->
+<!--        <driver name="TriggerTurnOnAnalysis"/>-->

         
     </execute>    
     <drivers>

@@ -33,15 +33,15 @@

             <truncateScale>1</truncateScale>
             <constantGain>0.15</constantGain>
         </driver>

-        <driver name="HPSEcalConverterAtoDDriver" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">

+<!--        <driver name="HPSEcalRawConverterDriver" type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">

             <runBackwards>true</runBackwards>
             <rawCollectionName>EcalReadoutHits</rawCollectionName>
             <ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>

-        </driver>
-        <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.HPSEcalTriggerFilterDriver">

+        </driver>-->
+<!--        <driver name="EcalTriggerFilter" type="org.lcsim.hps.recon.ecal.HPSEcalTriggerFilterDriver">

             <inputCollection>EcalTriggerHits</inputCollection>
             <outputCollection>EcalFilteredHits</outputCollection>

-        </driver>

+        </driver>-->

         <driver name="EcalTriggerClusterer" type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">
             <ecalName>Ecal</ecalName>
             <ecalCollectionName>EcalReadoutAnalogHits</ecalCollectionName>

@@ -52,6 +52,7 @@

         <driver name="EcalTrigger" type="org.lcsim.hps.recon.ecal.HPSFADCTriggerDriver">
         <!--<driver name="EcalTrigger" type="org.lcsim.hps.recon.ecal.HPSFADCSingleTriggerDriver">-->
             <clusterCollectionName>EcalTriggerClusters</clusterCollectionName>

+			<outputFileName>${outputFile}.triggers</outputFileName>

             <deadTime>0</deadTime>
             <!--<lcioFile>${outputFile}</lcioFile>-->
         </driver>
hps-java/src/main/resources/org/lcsim/hps/steering
ecal_fadc_bkgd.lcsim 1.12 -> 1.13
diff -u -r1.12 -r1.13
--- ecal_fadc_bkgd.lcsim	27 Aug 2012 22:42:19 -0000	1.12
+++ ecal_fadc_bkgd.lcsim	20 Nov 2012 23:32:22 -0000	1.13
@@ -1,20 +1,13 @@

 <!--
     Example LCSim steering file to run trigger rate studies
     @author Sho Uemura <[log in to unmask]>

-    @version $Id: ecal_fadc_bkgd.lcsim,v 1.12 2012/08/27 22:42:19 meeg Exp $

+    @version $Id: ecal_fadc_bkgd.lcsim,v 1.13 2012/11/20 23:32:22 meeg Exp $

 -->
 <lcsim xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
        xs:noNamespaceSchemaLocation="http://www.lcsim.org/schemas/lcsim/1.0/lcsim.xsd">

-	<inputFiles>
-		<file>${inputFile}</file>
-	</inputFiles>

 	<control>

-		<numberOfEvents>-1</numberOfEvents>

 		<printInputFiles>true</printInputFiles>
 	</control>

-	<classpath>
-		<jar>~/.m2/repository/org/lcsim/hps-java/1.0-SNAPSHOT/hps-java-1.0-SNAPSHOT.jar</jar>
-	</classpath>

 	<execute>
         <driver name="HPSCalibrationDriver"/>   
 		<driver name="EventMarkerDriver"/>

@@ -45,13 +38,14 @@

 			<ecalRawCollectionName>EcalRawHits</ecalRawCollectionName>
             <triggerThreshold>80</triggerThreshold>
             <readoutThreshold>50</readoutThreshold>

+            <scaleFactor>1</scaleFactor>
+            <fixedGain>0.15</fixedGain>

 		</driver>
 		<driver name="EcalConverter"

-                type="org.lcsim.hps.recon.ecal.HPSEcalConverterDriver">
-			<ecalName>Ecal</ecalName>

+                type="org.lcsim.hps.recon.ecal.HPSEcalRawConverterDriver">

 			<rawCollectionName>EcalRawHits</rawCollectionName>
 			<ecalCollectionName>EcalCorrectedHits</ecalCollectionName>

-			<scale>0.075</scale>

+			<gain>0.15</gain>

 		</driver>
 		<driver name="EcalClusterer"
                 type="org.lcsim.hps.recon.ecal.HPSEcalCTPClusterer">

@@ -62,7 +56,6 @@

                 type="org.lcsim.hps.recon.ecal.HPSFADCTriggerDriver">
 			<clusterCollectionName>EcalClusters</clusterCollectionName>
 			<outputFileName>${outputFile}.triggers</outputFileName>

-			<ecalName>Ecal</ecalName>

 			<deadTime>10</deadTime>
 		</driver>
 		<driver name="EcalPlots"
hps-java/src/main/resources/org/lcsim/hps/steering
SVTMonitoring.lcsim 1.5 -> 1.6
diff -u -r1.5 -r1.6
--- SVTMonitoring.lcsim	31 Aug 2012 01:30:47 -0000	1.5
+++ SVTMonitoring.lcsim	20 Nov 2012 23:32:22 -0000	1.6
@@ -16,16 +16,22 @@

         <driver name="TrackerReconDriver" />
 <!--        <driver name="SVTSimpleEventDisplay"/>-->
 <!--        <driver name="TrackTimePlots"/>-->

-        

+

         <driver name="EcalRawConverter" />
         <driver name="EcalClusterer" />
         <driver name="TrackingReconstructionPlots" />

+<!--        <driver name="RunControlDriver" />-->
+        <driver name="CleanupDriver"/>
+        <driver name="AidaSaveDriver"/>

     </execute>
     <drivers>

+        <driver name="RunControlDriver" type="org.lcsim.hps.monitoring.RunControlDriver"/>

         <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver">
             <eventInterval>1</eventInterval>
         </driver>

-        <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver"/>   

+        <driver name="HPSCalibrationDriver" type="org.lcsim.hps.monitoring.HPSCalibrationDriver">
+<!--            <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">
             <ecalCollectionName>EcalCalHits</ecalCollectionName>

@@ -46,7 +52,7 @@

             <stripTolerance>1.0</stripTolerance>
         </driver>
         <driver name="TrackingReconstructionPlots" type="org.lcsim.hps.monitoring.svt.TrackingReconstructionPlots">

-            <outputPlots>HPSTestRunTrackingPlots.aida</outputPlots>

+<!--            <outputPlots>HPSTestRunTrackingPlots.aida</outputPlots>-->

         </driver>
         <driver name="SVTSimpleEventDisplay" type="org.lcsim.hps.monitoring.svt.SVTSimpleEventDisplay">
             <inputCollection>SVTRawTrackerHits</inputCollection>

@@ -67,5 +73,11 @@

             <fittedTrackerHitCollectionName>SVTFittedRawTrackerHits</fittedTrackerHitCollectionName>   
         </driver>
         <driver name="TrackTimePlots" type="org.lcsim.hps.monitoring.svt.TrackTimePlots"/>

+        <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver">
+            <collectionNames>TrackerHits</collectionNames>
+        </driver> 
+        <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
+            <outputFileName>svtmon_plots2</outputFileName>
+        </driver>

     </drivers>
 </lcsim>

\ No newline at end of file
hps-java/src/main/resources/org/lcsim/hps/steering
ECalMonitoring.lcsim 1.14 -> 1.15
diff -u -r1.14 -r1.15
--- ECalMonitoring.lcsim	31 Aug 2012 01:30:47 -0000	1.14
+++ ECalMonitoring.lcsim	20 Nov 2012 23:32:22 -0000	1.15
@@ -22,8 +22,10 @@

         <driver name="EcalWindowPlots"/>
         <driver name="EcalDaqPlots"/>
 -->

+<!--        <driver name="RunControlDriver" />-->

     </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">
 <!--            <threshold>150</threshold>-->

@@ -69,7 +71,7 @@

             <inputCollection>EcalClusters</inputCollection>
         </driver>
         <driver name="TriggerPlots" type="org.lcsim.hps.monitoring.ecal.TriggerPlots">

-            <clusterEnergyCut>110</clusterEnergyCut>

+            <clusterEnergyCut>500</clusterEnergyCut>

         </driver>
     </drivers>
 </lcsim>
CVSspam 0.2.12

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