Author: [log in to unmask] Date: Mon Nov 10 18:25:34 2014 New Revision: 1492 Log: New and mods to my personal steering files Added: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/MattsScrewAround.lcsim - copied, changed from r1428, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/WriteLCIO.lcsim - copied, changed from r1254, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim Mon Nov 10 18:25:34 2014 @@ -9,7 +9,6 @@ <!-- <driver name="DQMDatabaseDriver"/> --> <driver name="CalibrationDriver"/> <driver name="RawTrackerHitSensorSetup"/> -<!-- <driver name="BadChannelFilter" /> --> <driver name="RawTrackerHitFitterDriver" /> <driver name="TrackerHitDriver"/> <driver name="HelicalTrackHitDriver"/> @@ -18,16 +17,16 @@ <driver name="EcalRawConverter" /> <driver name="EcalClusterer" /> <driver name="ReconParticle" /> -<!-- <driver name="SVTMonitoring"/> + <driver name="SVTMonitoring"/> <driver name="SVTHitMCEfficiency"/> <driver name="TrackingMonitoring"/> <driver name="TrackingResiduals"/> <driver name="TrackMCEfficiency"/> <driver name="FinalStateMonitoring"/> - <driver name="V0Monitoring"/> --> - <driver name="AddBeamSpotToTrack"/> + <driver name="V0Monitoring"/> + <!-- <driver name="AddBeamSpotToTrack"/> <driver name="BSTrackReconParticle" /> - <driver name="BeamSpotTrackAnalysis"/> + <driver name="BeamSpotTrackAnalysis"/> --> <driver name="AidaSaveDriver"/> <driver name="LCIOWriter"/> <driver name="CleanupDriver"/> @@ -57,6 +56,7 @@ <clusterTimeCut>16.0</clusterTimeCut> <maxSeperation>20.0</maxSeperation> <tolerance>1.0</tolerance> + <saveAxialHits>true</saveAxialHits> </driver> <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver"> @@ -77,7 +77,7 @@ <driver name="BeamSpotTrackAnalysis" type="org.hps.users.mgraham.BeamSpotTrackAnalysis"> </driver> <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver"> - <debug>true</debug> + <debug>false</debug> </driver> <driver name="BSTrackReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver"> Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/MattsScrewAround.lcsim (from r1428, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim) ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/MattsScrewAround.lcsim Mon Nov 10 18:25:34 2014 @@ -5,38 +5,30 @@ <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="DQMDatabaseDriver"/> --> - <driver name="CalibrationDriver"/> + <driver name="EventMarkerDriver"/> + <driver name="ConditionsDriver"/> + <driver name="SvtSensorSetup" /> <driver name="RawTrackerHitSensorSetup"/> -<!-- <driver name="BadChannelFilter" /> --> <driver name="RawTrackerHitFitterDriver" /> <driver name="TrackerHitDriver"/> <driver name="HelicalTrackHitDriver"/> - <driver name="TrackerReconDriver"/> - <driver name="TrackDataDriver"/> +<!-- <driver name="TrackerReconDriver"/> + <driver name="TrackDataDriver"/> -->1 + <driver name="AxialTrackReconDriver"/> <driver name="EcalRawConverter" /> <driver name="EcalClusterer" /> <driver name="ReconParticle" /> -<!-- <driver name="SVTMonitoring"/> - <driver name="SVTHitMCEfficiency"/> <driver name="TrackingMonitoring"/> - <driver name="TrackingResiduals"/> <driver name="TrackMCEfficiency"/> - <driver name="FinalStateMonitoring"/> - <driver name="V0Monitoring"/> --> - <driver name="AddBeamSpotToTrack"/> - <driver name="BSTrackReconParticle" /> - <driver name="BeamSpotTrackAnalysis"/> +<!-- <driver name="StraightTrackAnalysis"/> --> <driver name="AidaSaveDriver"/> <driver name="LCIOWriter"/> <driver name="CleanupDriver"/> </execute> <drivers> - <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/> - <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"> - <runNumber>${runNumber}</runNumber> - </driver> + <driver name="ConditionsDriver" type="org.hps.conditions.ConditionsDriver" /> + <driver name="SvtSensorSetup" type="org.hps.recon.tracking.SvtSensorSetup" /> + <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/> <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> <eventInterval>1</eventInterval> </driver> @@ -53,10 +45,11 @@ <debug>false</debug> </driver> <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver"> - <debug>false</debug> + <debug>true</debug> <clusterTimeCut>16.0</clusterTimeCut> <maxSeperation>20.0</maxSeperation> <tolerance>1.0</tolerance> + <saveAxialHits>true</saveAxialHits> </driver> <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver"> @@ -77,7 +70,7 @@ <driver name="BeamSpotTrackAnalysis" type="org.hps.users.mgraham.BeamSpotTrackAnalysis"> </driver> <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver"> - <debug>true</debug> + <debug>false</debug> </driver> <driver name="BSTrackReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver"> @@ -102,6 +95,7 @@ <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring"> <runNumber>${runNumber}</runNumber> <overwriteDB>false</overwriteDB> + <trackCollectionName>StraightTracks</trackCollectionName> </driver> <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals"> <runNumber>${runNumber}</runNumber> @@ -111,9 +105,7 @@ <runNumber>${runNumber}</runNumber> <overwriteDB>false</overwriteDB> </driver> - <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency"> - <overwriteDB>false</overwriteDB> - </driver> + <driver name="SVTHitMCEfficiency" type="org.hps.analysis.dataquality.SVTHitMCEfficiency"> <overwriteDB>false</overwriteDB> <printDQMStrings>false</printDQMStrings> @@ -127,5 +119,25 @@ type="org.lcsim.util.loop.LCIODriver"> <outputFilePath>blah.slcio</outputFilePath> </driver> + + <driver name="AxialTrackReconDriver" + type="org.hps.recon.tracking.axial.AxialTrackReconDriver"> + <debug>false</debug> + <strategyResource>/org/hps/recon/tracking/strategies/HPS-Axial.xml</strategyResource> + <trackCollectionName>StraightTracks</trackCollectionName> + </driver> + + <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency"> + <overwriteDB>false</overwriteDB> + <trackCollectionName>StraightTracks</trackCollectionName> + <trackHitCollectionName>RotatedAxialTrackHits</trackHitCollectionName> + <trackHitMCRelationsCollectionName>RotatedAxialTrackHitsMCRelations</trackHitMCRelationsCollectionName> + </driver> + + <driver name="StraightTrackAnalysis" + type="org.hps.users.mgraham.StraightTrackAnalysis"> + <tracksName>StraightTracks</tracksName> + </driver> + </drivers> </lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/NoTimeNoTriggerRecon.lcsim Mon Nov 10 18:25:34 2014 @@ -15,9 +15,14 @@ <driver name="CalibrationDriver"/> <driver name="TrackerDigiDriver"/> <driver name="HelicalTrackHitDriver"/> - <driver name="TrackerReconDriver"/> - <driver name="StraightTrackFinder"/> - <driver name="StraightTrackAnalysis"/> + <driver name="AxialTrackReconDriver"/> +<!-- <driver name="TrackerReconDriver"/> + <driver name="TrackDataDriver"/> --> +<!-- <driver name="StraightTrackReconDriver"/> --> + <driver name="StraightTrackAnalysis"/> + <driver name="SVTMonitoring"/> + <driver name="TrackingMonitoring"/> + <driver name="TrackingResiduals"/> <driver name="AidaSaveDriver"/> <driver name="LCIOWriter"/> <driver name="CleanupDriver"/> @@ -31,7 +36,7 @@ <driver name="EventMarkerDriver" type="org.lcsim.job.EventMarkerDriver"> - <eventInterval>1000</eventInterval> + <eventInterval>1</eventInterval> </driver> <driver name="TrackerDigiDriver" type="org.hps.recon.tracking.SimpleTrackerDigiDriver"> @@ -44,25 +49,62 @@ <debug>false</debug> <maxSeperation>20.0</maxSeperation> <tolerance>1.0</tolerance> + <saveAxialHits>true</saveAxialHits> </driver> <driver name="TrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver"> <debug>false</debug> - <strategyResource>/org/hps/recon/tracking/strategies/HPS-Test-4pt1.xml</strategyResource> + <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource> + </driver> + + <driver name="AxialTrackReconDriver" + type="org.hps.recon.tracking.axial.AxialTrackReconDriver"> + <debug>true</debug> + <strategyResource>/org/hps/recon/tracking/strategies/HPS-Axial.xml</strategyResource> + <trackCollectionName>StraightTracks</trackCollectionName> + </driver> + + + <driver name="StraightTrackReconDriver" + type="org.hps.recon.tracking.straighttracks.StraightTrackReconDriver"> + <debug>false</debug> + <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-StraightTracks.xml</strategyResource> </driver> <driver name="StraightTrackAnalysis" type="org.hps.users.mgraham.StraightTrackAnalysis"> - </driver> - <driver name="StraightTrackFinder" - type="org.hps.recon.tracking.nobfield.StraightTrackFinder"> + <tracksName>StraightTracks</tracksName> </driver> <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver"> <outputFilePath>${outputFile}</outputFilePath> </driver> - + <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver"> + </driver> + <driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring"> + <runNumber>${runNumber}</runNumber> + <overwriteDB>false</overwriteDB> + </driver> + <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring"> + <runNumber>${runNumber}</runNumber> + <overwriteDB>false</overwriteDB> + </driver> + <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals"> + <runNumber>${runNumber}</runNumber> + <overwriteDB>false</overwriteDB> + </driver> + <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring"> + <runNumber>${runNumber}</runNumber> + <overwriteDB>false</overwriteDB> + </driver> + <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency"> + <overwriteDB>false</overwriteDB> + </driver> + <driver name="SVTHitMCEfficiency" type="org.hps.analysis.dataquality.SVTHitMCEfficiency"> + <overwriteDB>false</overwriteDB> + <printDQMStrings>false</printDQMStrings> + </driver> <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver"> <outputFileName>./straight-tracks.root</outputFileName> </driver> Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/WriteLCIO.lcsim (from r1254, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim) ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/DataQualityMonitor.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/WriteLCIO.lcsim Mon Nov 10 18:25:34 2014 @@ -1,131 +1,22 @@ <!-- - Steering file for testing DataQualityMonitoring classes + Really dumb steering file that just writes an the first X (specified on command line) events from an LCIO file @author Matt Graham <[log in to unmask]> --> <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="DQMDatabaseDriver"/> --> - <driver name="CalibrationDriver"/> - <driver name="RawTrackerHitSensorSetup"/> -<!-- <driver name="BadChannelFilter" /> --> - <driver name="RawTrackerHitFitterDriver" /> - <driver name="TrackerHitDriver"/> - <driver name="HelicalTrackHitDriver"/> - <driver name="TrackerReconDriver"/> - <driver name="TrackDataDriver"/> - <driver name="EcalRawConverter" /> - <driver name="EcalClusterer" /> - <driver name="ReconParticle" /> -<!-- <driver name="SVTMonitoring"/> - <driver name="SVTHitMCEfficiency"/> - <driver name="TrackingMonitoring"/> - <driver name="TrackingResiduals"/> - <driver name="TrackMCEfficiency"/> - <driver name="FinalStateMonitoring"/> - <driver name="V0Monitoring"/> --> - <driver name="AddBeamSpotToTrack"/> - <driver name="BSTrackReconParticle" /> - <driver name="BeamSpotTrackAnalysis"/> - <driver name="AidaSaveDriver"/> <driver name="LCIOWriter"/> <driver name="CleanupDriver"/> </execute> <drivers> - <driver name="DQMDatabaseDriver" type="org.hps.analysis.dataquality.DQMDatabaseDriver"/> - <driver name="CalibrationDriver" type="org.hps.conditions.deprecated.CalibrationDriver"> - <runNumber>${runNumber}</runNumber> - </driver> <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="BadChannelFilter" type="org.hps.recon.tracking.SVTBadChannelFilterDriver" /> - <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"> - <debug>false</debug> - </driver> - <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"> - <debug>false</debug> - <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full.xml</strategyResource> - </driver> - <driver name="TrackDataDriver" type="org.hps.recon.tracking.TrackDataDriver"> - </driver> - <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver"> - <ecalCollectionName>EcalCalHits</ecalCollectionName> - </driver> - <driver name="EcalClusterer" type="org.hps.recon.ecal.EcalClusterer"> - <ecalName>Ecal</ecalName> - <ecalCollectionName>EcalCalHits</ecalCollectionName> - </driver> - <driver name="AddBeamSpotToTrack" type="org.hps.users.mgraham.AddBeamSpotToTrack"> - </driver> - <driver name="BeamSpotTrackAnalysis" type="org.hps.users.mgraham.BeamSpotTrackAnalysis"> - </driver> - <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver"> - <debug>true</debug> - </driver> - - <driver name="BSTrackReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver"> - <debug>true</debug> - <tracksCollectionName>BeamSpotTracks</tracksCollectionName> - <finalStateParticlesColName>BSFinalStateParticles</finalStateParticlesColName> - <unconstrainedV0CandidatesColName>BSUnconstrainedV0Candidates</unconstrainedV0CandidatesColName> - <beamConV0CandidatesColName>BSBeamspotConstrainedV0Candidates</beamConV0CandidatesColName> - <targetConV0CandidatesColName>BSTargetConstrainedV0Candidates</targetConV0CandidatesColName> - <unconstrainedV0VerticesColName>BSUnconstrainedV0Vertices</unconstrainedV0VerticesColName> - <beamConV0VerticesColName>BSBeamspotConstrainedV0Vertices</beamConV0VerticesColName> - <targetConV0VerticesColName>BSTargetConstrainedV0Vertices</targetConV0VerticesColName> - </driver> - - <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver"> - <outputFileName>./conditions_test_plots.root</outputFileName> - </driver> - <driver name="SVTMonitoring" type="org.hps.analysis.dataquality.SvtMonitoring"> - <runNumber>${runNumber}</runNumber> - <overwriteDB>false</overwriteDB> - </driver> - <driver name="TrackingMonitoring" type="org.hps.analysis.dataquality.TrackingMonitoring"> - <runNumber>${runNumber}</runNumber> - <overwriteDB>false</overwriteDB> - </driver> - <driver name="TrackingResiduals" type="org.hps.analysis.dataquality.TrackingResiduals"> - <runNumber>${runNumber}</runNumber> - <overwriteDB>false</overwriteDB> - </driver> - <driver name="FinalStateMonitoring" type="org.hps.analysis.dataquality.FinalStateMonitoring"> - <runNumber>${runNumber}</runNumber> - <overwriteDB>false</overwriteDB> - </driver> - <driver name="TrackMCEfficiency" type="org.hps.analysis.dataquality.TrackMCEfficiency"> - <overwriteDB>false</overwriteDB> - </driver> - <driver name="SVTHitMCEfficiency" type="org.hps.analysis.dataquality.SVTHitMCEfficiency"> - <overwriteDB>false</overwriteDB> - <printDQMStrings>false</printDQMStrings> - </driver> - <driver name="V0Monitoring" type="org.hps.analysis.dataquality.V0Monitoring"> - <runNumber>${runNumber}</runNumber> - <overwriteDB>false</overwriteDB> - </driver> <driver name="CleanupDriver" type="org.lcsim.recon.tracking.digitization.sisim.config.ReadoutCleanupDriver"/> - <driver name="LCIOWriter" + <driver name="LCIOWriter" type="org.lcsim.util.loop.LCIODriver"> - <outputFilePath>blah.slcio</outputFilePath> + <outputFilePath>${outputFile}.slcio</outputFilePath> </driver> </drivers> </lcsim>