LISTSERV mailing list manager LISTSERV 16.5

Help for HPS-SVN Archives

HPS-SVN Archives

HPS-SVN Archives


HPS-SVN@LISTSERV.SLAC.STANFORD.EDU


View:

Message:

[

First

|

Previous

|

Next

|

Last

]

By Topic:

[

First

|

Previous

|

Next

|

Last

]

By Author:

[

First

|

Previous

|

Next

|

Last

]

Font:

Proportional Font
LISTSERV Archives

LISTSERV Archives
HPS-SVN Home

HPS-SVN Home
HPS-SVN July 2015

HPS-SVN July 2015

Subject:

r3253 - in /java/trunk: steering-files/src/main/resources/org/hps/steering/users/mgraham/ tracking/src/main/resources/org/hps/recon/tracking/strategies/ users/src/main/java/org/hps/users/mgraham/

From:

[log in to unmask]

Reply-To:

Notification of commits to the hps svn repository <[log in to unmask]>

Date:

Thu, 9 Jul 2015 18:16:02 -0000

Content-Type:

text/plain

Parts/Attachments:
Parts/Attachments

text/plain (632 lines) 

Author: [log in to unmask]
Date: Thu Jul  9 11:15:39 2015
New Revision: 3253

Log:
Add steering file for straight track recon and minor mods to strategy & an analysis driver; also add a steering file for SVT opening measurement

Added:
    java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/StraightTrackRecon.lcsim
      - copied, changed from r3250, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim
    java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackAlignmentStudy.lcsim
      - copied, changed from r3250, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim
Modified:
    java/trunk/tracking/src/main/resources/org/hps/recon/tracking/strategies/HPS-Full-StraightTracks.xml
    java/trunk/users/src/main/java/org/hps/users/mgraham/StraightTrackAnalysis.java

Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/StraightTrackRecon.lcsim (from r3250, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim)
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/StraightTrackRecon.lcsim	Thu Jul  9 11:15:39 2015
@@ -10,52 +10,14 @@
         <driver name="RawTrackerHitFitterDriver" />
         <driver name="TrackerHitDriver"/>
         <driver name="HelicalTrackHitDriver"/>
-        <driver name="FullTrackerReconDriver"/><!--
-                <driver name="TrackDataDriver" />    
-        -->        
+        <driver name="StraightTrackReconDriver"/>
+        <driver name="StraightTrackAnalysis"/>
         <driver name="EcalRunningPedestal"/>
-        <driver name="EcalRawConverter" /><!--
--->        
-        <driver name="ReconClusterer" /><!--
--->        
-        <driver name="ReconParticle" /> <!--
-        <driver name="GTPOnlineClusterer" /> 
-          SVT opening angle alignment -->
-        <driver name="SplitHitsOnTrack"/>       
-        <driver name="TrackerL1to3ReconDriver"/> 
-        <driver name="TrackerL4to6ReconDriver"/> 
-        <driver name="TrackerL134ReconDriver"/> 
-        <driver name="ReconParticleL1to3" />
-        <driver name="ReconParticleL4to6" />
-        <driver name="ReconParticleL134" />
-        <driver name="SVTAlignment"/> 
+        <driver name="EcalRawConverter" />
+        <driver name="ReconClusterer" />
+        <driver name="ReconParticle" /> 
         <driver name="TrackingMonitoringSingles1DQM" /> 
-        <driver name="TrackingMonitoringL1to3Singles1DQM"/>
-        <driver name="TrackingMonitoringL4to6Singles1DQM"/>
-        <driver name="TrackingMonitoringL134Singles1DQM"/>
-        <driver name="FinalStateL1to3DQMSingles1"/>
-        <driver name="FinalStateL4to6DQMSingles1"/>
-        <driver name="FinalStateL134DQMSingles1"/>
-        <!-- Online Monitoring Drivers -->
-        <!--       <driver name="TrackingMonitoring" />  
-        <driver name="TrackingResiduals"/>  
-        <driver name="TrackTime"/>  
-        <driver name="V0Monitoring"/>    -->       
-        <!--        <driver name="SVTMonitoring"/>  
-                <driver name="TrackingMonitoringDQM" />  
-                <driver name="TrackingMonitoringSingles1DQM" />  
-                <driver name="TrackingMonitoringPairs1DQM" />  
-                <driver name="TrackingResidualsPairs1DQM"/>  
-                <driver name="TrackingResidualsSingles1DQM"/>  
-                <driver name="FinalStateDQM"/>  
-        -->        
-        <driver name="FinalStateDQMSingles1"/><!--
-        <driver name="FinalStateDQMPairs1"/>
-        <driver name="V0DQM"/>  
-        <driver name="V0DQMSingles1"/>
-        <driver name="V0DQMPairs1"/>
-        <driver name="TridentMonitoringPairs1"/>-->
-        <!--        <driver name="PositronDebug"/>-->
+        <driver name="FinalStateDQMSingles1"/>
         <driver name="AidaSaveDriver"/>     
         <driver name="LCIOWriter"/>     
         <driver name="CleanupDriver" /> 
@@ -65,146 +27,51 @@
             <eventInterval>1000</eventInterval>
         </driver>
         <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
-        <!--        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Analytic</fitAlgorithm>
-            <useTimestamps>false</useTimestamps>
-            <correctT0Shift>false</correctT0Shift>
-            <useTruthTime>false</useTruthTime>
-            <debug>false</debug>
-        </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>
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
-            <saveAxialHits>false</saveAxialHits>
-        </driver>-->
-        
-        <driver name="SplitHitsOnTrack" type="org.hps.users.mgraham.SplitHitsOnTracks">             
-        </driver>
-        <driver name="TrackerL1to3ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-<!--            <includeMS>false</includeMS>
-            <useHPSMaterialManager>false</useHPSMaterialManager>-->
-            <inputHitCollectionName>OnTrackHits</inputHitCollectionName>
-            <trackCollectionName>L1to3Tracks</trackCollectionName>
-            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L1-3.xml</strategyResource>
-        </driver>
-        <driver name="TrackerL4to6ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-<!--            <includeMS>false</includeMS>
-            <useHPSMaterialManager>false</useHPSMaterialManager>-->
-            <trackCollectionName>L4to6Tracks</trackCollectionName>
-            <inputHitCollectionName>OnTrackHits</inputHitCollectionName>
-            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L4-6.xml</strategyResource>
-        </driver>
-         <driver name="TrackerL134ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-<!--            <includeMS>false</includeMS>
-            <useHPSMaterialManager>false</useHPSMaterialManager>-->
-            <trackCollectionName>L134Tracks</trackCollectionName>
-            <inputHitCollectionName>OnTrackHits</inputHitCollectionName>
-            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L134.xml</strategyResource>
-        </driver>
-        <!--        <driver name="FullTrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-            <trackCollectionName>MatchedTracks</trackCollectionName>
-            <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>
-            <use2014Gain>false</use2014Gain>
-            <useTimestamps>false</useTimestamps>
-            <useTruthTime>false</useTruthTime>               
-           <debug>false</debug>
-        </driver>
-         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">              
-               <useTimeCut>true</useTimeCut>
-               <logLevel>ALL</logLevel>
-        </driver>     -->
         <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
             <debug>false</debug>
             <dxCut>50</dxCut>
             <dyCut>50</dyCut>
         </driver>  
         
-        <driver name="ReconParticleL1to3" type="org.hps.recon.particle.HpsReconParticleDriver">
-            <trackCollectionName>L1to3Tracks</trackCollectionName>
-            <targetConV0VerticesColName>TargetConstrainedV0CandidatesL1to3</targetConV0VerticesColName>
-            <finalStateParticlesColName>FinalStateParticlesL1to3</finalStateParticlesColName>
-            <unconstrainedV0CandidatesColName>UnconstrainedV0CandidatesL1to3</unconstrainedV0CandidatesColName>
-            <beamConV0CandidatesColName>BeamspotConstrainedV0CandidatesL1to3</beamConV0CandidatesColName>
-            <unconstrainedV0VerticesColName>UnconstrainedV0VerticesL1to3</unconstrainedV0VerticesColName>
-            <beamConV0VerticesColName>BeamspotConstrainedV0VerticesL1to3</beamConV0VerticesColName>   
-            <targetConV0VerticesColName>TargetConstrainedV0VerticesL1to3</targetConV0VerticesColName>     
+         <driver name="StraightTrackReconDriver" type="org.hps.recon.tracking.straighttracks.StraightTrackReconDriver">
             <debug>false</debug>
-            <dxCut>50</dxCut>
-            <dyCut>50</dyCut>
-        </driver>  
-        <driver name="ReconParticleL4to6" type="org.hps.recon.particle.HpsReconParticleDriver">
-            <trackCollectionName>L4to6Tracks</trackCollectionName>          
-            <targetConV0VerticesColName>TargetConstrainedV0CandidatesL4to6</targetConV0VerticesColName>
-            <finalStateParticlesColName>FinalStateParticlesL4to6</finalStateParticlesColName>
-            <unconstrainedV0CandidatesColName>UnconstrainedV0CandidatesL4to6</unconstrainedV0CandidatesColName>
-            <beamConV0CandidatesColName>BeamspotConstrainedV0CandidatesL4to6</beamConV0CandidatesColName>
-            <unconstrainedV0VerticesColName>UnconstrainedV0VerticesL4to6</unconstrainedV0VerticesColName>
-            <beamConV0VerticesColName>BeamspotConstrainedV0VerticesL4to6</beamConV0VerticesColName>   
-            <targetConV0VerticesColName>TargetConstrainedV0VerticesL4to6</targetConV0VerticesColName>     
-            <debug>false</debug>
-            <dxCut>50</dxCut>
-            <dyCut>50</dyCut>
-        </driver>  
-        
-          <driver name="ReconParticleL134" type="org.hps.recon.particle.HpsReconParticleDriver">
-            <trackCollectionName>L134Tracks</trackCollectionName>          
-            <targetConV0VerticesColName>TargetConstrainedV0CandidatesL134</targetConV0VerticesColName>
-            <finalStateParticlesColName>FinalStateParticlesL134</finalStateParticlesColName>
-            <unconstrainedV0CandidatesColName>UnconstrainedV0CandidatesL134</unconstrainedV0CandidatesColName>
-            <beamConV0CandidatesColName>BeamspotConstrainedV0CandidatesL134</beamConV0CandidatesColName>
-            <unconstrainedV0VerticesColName>UnconstrainedV0VerticesL134</unconstrainedV0VerticesColName>
-            <beamConV0VerticesColName>BeamspotConstrainedV0VerticesL134</beamConV0VerticesColName>   
-            <targetConV0VerticesColName>TargetConstrainedV0VerticesL134</targetConV0VerticesColName>     
-            <debug>false</debug>
-            <dxCut>50</dxCut>
-            <dyCut>50</dyCut>
-        </driver>  
+            <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-StraightTracks.xml</strategyResource>
+            <trackCollectionName>MatchedTracks</trackCollectionName>
+        </driver>
+        
+        <driver name="StraightTrackAnalysis" type="org.hps.users.mgraham.StraightTrackAnalysis">
+             <trackCollectionName>MatchedTracks</trackCollectionName>
+        </driver>
+        
         
         <!-- EngineeringRun2015FullRecon from Sho --> 
         <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Pileup</fitAlgorithm>
+             <fitAlgorithm>Pileup</fitAlgorithm>
             <useTimestamps>false</useTimestamps>
-            <correctT0Shift>false</correctT0Shift>
+            <correctTimeOffset>true</correctTimeOffset>
+            <correctT0Shift>true</correctT0Shift>
             <useTruthTime>false</useTruthTime>
             <subtractTOF>true</subtractTOF>
             <subtractTriggerTime>true</subtractTriggerTime>
             <correctChanT0>true</correctChanT0>
-            <timeOffset>51.0</timeOffset>
-            <debug>false</debug>
+            <debug>false</debug>            
         </driver>
         <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
             <neighborDeltaT>8.0</neighborDeltaT>
-<!--            <neighborDeltaT>24.0</neighborDeltaT>-->
         </driver>
         <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
             <debug>false</debug>
-<!--            <clusterTimeCut>10.0</clusterTimeCut>
-            <maxDt>12.0</maxDt>-->
             <clusterTimeCut>12.0</clusterTimeCut>
             <maxDt>16.0</maxDt>
-<!--            <clusterTimeCut>24.0</clusterTimeCut>
-            <maxDt>24.0</maxDt>-->
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
+            <clusterAmplitudeCut>400.0</clusterAmplitudeCut>
         </driver>
         <driver name="FullTrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
             <strategyResource>HPS-Full.xml</strategyResource>
             <debug>false</debug>             
             <rmsTimeCut>8.0</rmsTimeCut>
-<!--            <rmsTimeCut>24.0</rmsTimeCut>-->
         </driver>    
         <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
             <logLevel>CONFIG</logLevel>
@@ -217,28 +84,27 @@
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>true</useRunningPedestal>
-            <useTimeWalkCorrection>true</useTimeWalkCorrection>
+            <useTimeWalkCorrection>false</useTimeWalkCorrection>
             <emulateFirmware>true</emulateFirmware>
-            <emulateMode7>false</emulateMode7>
+            <emulateMode7>true</emulateMode7>
             <leadingEdgeThreshold>12</leadingEdgeThreshold>
             <nsa>100</nsa>
             <nsb>20</nsb>
-            <windowSamples>50</windowSamples>
             <nPeak>3</nPeak>
+            <useFit>true</useFit>
+            <fixShapeParameter>true</fixShapeParameter>
         </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> 
-            <clusterEnergyThreshold>0.200</clusterEnergyThreshold>
+            <hitEnergyThreshold>0.0075</hitEnergyThreshold>
+            <seedEnergyThreshold>0.050</seedEnergyThreshold> 
+            <clusterEnergyThreshold>0.100</clusterEnergyThreshold>
             <minTime>0.0</minTime>
             <timeWindow>25.0</timeWindow>
             <useTimeCut>true</useTimeCut>
             <writeRejectedHitCollection>false</writeRejectedHitCollection>
-        </driver>                
-        <!-- End of EngineeringRun2015FullRecon from Sho --> 
-           
+        </driver>                           
                       
         <driver name="TrackingMonitoring" type="org.hps.monitoring.drivers.trackrecon.TrackingReconPlots">         
         </driver>
@@ -258,23 +124,6 @@
             <printDQMStrings>false</printDQMStrings>
         </driver>
         
-            <driver name="TrackingMonitoringL1to3Singles1DQM" type="org.hps.analysis.dataquality.TrackingMonitoring">         
-                <trackCollectionName>L1to3Tracks</trackCollectionName>
-                <overwriteDB>false</overwriteDB>
-            <printDQMStrings>false</printDQMStrings>
-        </driver>
-           <driver name="TrackingMonitoringL4to6Singles1DQM" type="org.hps.analysis.dataquality.TrackingMonitoring">         
-                <trackCollectionName>L4to6Tracks</trackCollectionName>
-                <overwriteDB>false</overwriteDB>
-            <printDQMStrings>false</printDQMStrings>
-        </driver>
-        
-           <driver name="TrackingMonitoringL134Singles1DQM" type="org.hps.analysis.dataquality.TrackingMonitoring">         
-                <trackCollectionName>L134Tracks</trackCollectionName>
-                <overwriteDB>false</overwriteDB>
-            <printDQMStrings>false</printDQMStrings>
-        </driver>
-        
         
         <driver name="TrackingMonitoringSingles1DQM" type="org.hps.analysis.dataquality.TrackingMonitoring">         
             <overwriteDB>false</overwriteDB>
@@ -301,26 +150,6 @@
             <overwriteDB>false</overwriteDB>
             <printDQMStrings>false</printDQMStrings>
             <triggerType>all</triggerType>
-        </driver>
-        
-        <driver name="FinalStateL1to3DQMSingles1" type="org.hps.analysis.dataquality.FinalStateMonitoring">        
-            <finalStateParticlesColName>FinalStateParticlesL1to3</finalStateParticlesColName>
-            <overwriteDB>false</overwriteDB>
-            <printDQMStrings>false</printDQMStrings>
-            <triggerType>singles1</triggerType>
-        </driver>
-        
-        <driver name="FinalStateL4to6DQMSingles1" type="org.hps.analysis.dataquality.FinalStateMonitoring">        
-            <finalStateParticlesColName>FinalStateParticlesL4to6</finalStateParticlesColName>
-            <overwriteDB>false</overwriteDB>
-            <printDQMStrings>false</printDQMStrings>
-            <triggerType>singles1</triggerType>
-        </driver>
-         <driver name="FinalStateL134DQMSingles1" type="org.hps.analysis.dataquality.FinalStateMonitoring">        
-            <finalStateParticlesColName>FinalStateParticlesL134</finalStateParticlesColName>
-            <overwriteDB>false</overwriteDB>
-            <printDQMStrings>false</printDQMStrings>
-            <triggerType>singles1</triggerType>
         </driver>
         <driver name="FinalStateDQMPairs1" type="org.hps.analysis.dataquality.FinalStateMonitoring">        
             <overwriteDB>false</overwriteDB>
@@ -359,10 +188,7 @@
         
         <driver name="TridentMonitoringPairs1" type="org.hps.analysis.dataquality.TridentMonitoring">
             <triggerType>pairs1</triggerType>
-        </driver>
-        
-        <driver name="PositronDebug" type="org.hps.users.mgraham.PositronDebug">                   
-        </driver>
+        </driver>        
         <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver">
             <outputFileName>./${outputFile}.root</outputFileName>
         </driver>

Copied: java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackAlignmentStudy.lcsim (from r3250, java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim)
 =============================================================================
--- java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackingAndReconMonitoring.lcsim	(original)
+++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/mgraham/TrackAlignmentStudy.lcsim	Thu Jul  9 11:15:39 2015
@@ -10,52 +10,23 @@
         <driver name="RawTrackerHitFitterDriver" />
         <driver name="TrackerHitDriver"/>
         <driver name="HelicalTrackHitDriver"/>
-        <driver name="FullTrackerReconDriver"/><!--
-                <driver name="TrackDataDriver" />    
-        -->        
+        <driver name="FullTrackerReconDriver"/>
         <driver name="EcalRunningPedestal"/>
-        <driver name="EcalRawConverter" /><!--
--->        
-        <driver name="ReconClusterer" /><!--
--->        
-        <driver name="ReconParticle" /> <!--
-        <driver name="GTPOnlineClusterer" /> 
-          SVT opening angle alignment -->
+        <driver name="EcalRawConverter" />
+        <driver name="ReconClusterer" />
+        <driver name="ReconParticle" /> 
         <driver name="SplitHitsOnTrack"/>       
         <driver name="TrackerL1to3ReconDriver"/> 
         <driver name="TrackerL4to6ReconDriver"/> 
-        <driver name="TrackerL134ReconDriver"/> 
         <driver name="ReconParticleL1to3" />
         <driver name="ReconParticleL4to6" />
-        <driver name="ReconParticleL134" />
         <driver name="SVTAlignment"/> 
         <driver name="TrackingMonitoringSingles1DQM" /> 
         <driver name="TrackingMonitoringL1to3Singles1DQM"/>
         <driver name="TrackingMonitoringL4to6Singles1DQM"/>
-        <driver name="TrackingMonitoringL134Singles1DQM"/>
         <driver name="FinalStateL1to3DQMSingles1"/>
         <driver name="FinalStateL4to6DQMSingles1"/>
-        <driver name="FinalStateL134DQMSingles1"/>
-        <!-- Online Monitoring Drivers -->
-        <!--       <driver name="TrackingMonitoring" />  
-        <driver name="TrackingResiduals"/>  
-        <driver name="TrackTime"/>  
-        <driver name="V0Monitoring"/>    -->       
-        <!--        <driver name="SVTMonitoring"/>  
-                <driver name="TrackingMonitoringDQM" />  
-                <driver name="TrackingMonitoringSingles1DQM" />  
-                <driver name="TrackingMonitoringPairs1DQM" />  
-                <driver name="TrackingResidualsPairs1DQM"/>  
-                <driver name="TrackingResidualsSingles1DQM"/>  
-                <driver name="FinalStateDQM"/>  
-        -->        
-        <driver name="FinalStateDQMSingles1"/><!--
-        <driver name="FinalStateDQMPairs1"/>
-        <driver name="V0DQM"/>  
-        <driver name="V0DQMSingles1"/>
-        <driver name="V0DQMPairs1"/>
-        <driver name="TridentMonitoringPairs1"/>-->
-        <!--        <driver name="PositronDebug"/>-->
+        <driver name="FinalStateDQMSingles1"/>
         <driver name="AidaSaveDriver"/>     
         <driver name="LCIOWriter"/>     
         <driver name="CleanupDriver" /> 
@@ -65,67 +36,28 @@
             <eventInterval>1000</eventInterval>
         </driver>
         <driver name="RawTrackerHitSensorSetup" type="org.lcsim.recon.tracking.digitization.sisim.config.RawTrackerHitSensorSetup" />
-        <!--        <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Analytic</fitAlgorithm>
-            <useTimestamps>false</useTimestamps>
-            <correctT0Shift>false</correctT0Shift>
-            <useTruthTime>false</useTruthTime>
-            <debug>false</debug>
-        </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>
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
-            <saveAxialHits>false</saveAxialHits>
-        </driver>-->
-        
         <driver name="SplitHitsOnTrack" type="org.hps.users.mgraham.SplitHitsOnTracks">             
         </driver>
         <driver name="TrackerL1to3ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
             <debug>false</debug>
-<!--            <includeMS>false</includeMS>
-            <useHPSMaterialManager>false</useHPSMaterialManager>-->
             <inputHitCollectionName>OnTrackHits</inputHitCollectionName>
             <trackCollectionName>L1to3Tracks</trackCollectionName>
             <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L1-3.xml</strategyResource>
         </driver>
         <driver name="TrackerL4to6ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
             <debug>false</debug>
-<!--            <includeMS>false</includeMS>
-            <useHPSMaterialManager>false</useHPSMaterialManager>-->
             <trackCollectionName>L4to6Tracks</trackCollectionName>
             <inputHitCollectionName>OnTrackHits</inputHitCollectionName>
             <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L4-6.xml</strategyResource>
         </driver>
          <driver name="TrackerL134ReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
             <debug>false</debug>
-<!--            <includeMS>false</includeMS>
-            <useHPSMaterialManager>false</useHPSMaterialManager>-->
             <trackCollectionName>L134Tracks</trackCollectionName>
             <inputHitCollectionName>OnTrackHits</inputHitCollectionName>
             <strategyResource>/org/hps/recon/tracking/strategies/HPS-Full-L134.xml</strategyResource>
         </driver>
-        <!--        <driver name="FullTrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
-            <debug>false</debug>
-            <trackCollectionName>MatchedTracks</trackCollectionName>
-            <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>
-            <use2014Gain>false</use2014Gain>
-            <useTimestamps>false</useTimestamps>
-            <useTruthTime>false</useTruthTime>               
-           <debug>false</debug>
-        </driver>
-         <driver name="EcalClusterer" type="org.hps.recon.ecal.cluster.ReconClusterDriver">              
-               <useTimeCut>true</useTimeCut>
-               <logLevel>ALL</logLevel>
-        </driver>     -->
         <driver name="ReconParticle" type="org.hps.recon.particle.HpsReconParticleDriver">
             <debug>false</debug>
             <dxCut>50</dxCut>
@@ -175,36 +107,29 @@
         
         <!-- EngineeringRun2015FullRecon from Sho --> 
         <driver name="RawTrackerHitFitterDriver" type="org.hps.recon.tracking.RawTrackerHitFitterDriver">
-            <fitAlgorithm>Pileup</fitAlgorithm>
+             <fitAlgorithm>Pileup</fitAlgorithm>
             <useTimestamps>false</useTimestamps>
-            <correctT0Shift>false</correctT0Shift>
+            <correctTimeOffset>true</correctTimeOffset>
+            <correctT0Shift>true</correctT0Shift>
             <useTruthTime>false</useTruthTime>
             <subtractTOF>true</subtractTOF>
             <subtractTriggerTime>true</subtractTriggerTime>
             <correctChanT0>true</correctChanT0>
-            <timeOffset>51.0</timeOffset>
-            <debug>false</debug>
+            <debug>false</debug>            
         </driver>
         <driver name="TrackerHitDriver" type="org.hps.recon.tracking.DataTrackerHitDriver">
             <neighborDeltaT>8.0</neighborDeltaT>
-<!--            <neighborDeltaT>24.0</neighborDeltaT>-->
         </driver>
         <driver name="HelicalTrackHitDriver" type="org.hps.recon.tracking.HelicalTrackHitDriver">
             <debug>false</debug>
-<!--            <clusterTimeCut>10.0</clusterTimeCut>
-            <maxDt>12.0</maxDt>-->
             <clusterTimeCut>12.0</clusterTimeCut>
             <maxDt>16.0</maxDt>
-<!--            <clusterTimeCut>24.0</clusterTimeCut>
-            <maxDt>24.0</maxDt>-->
-            <maxSeperation>20.0</maxSeperation>
-            <tolerance>1.0</tolerance>
+            <clusterAmplitudeCut>400.0</clusterAmplitudeCut>
         </driver>
         <driver name="FullTrackerReconDriver" type="org.hps.recon.tracking.TrackerReconDriver">
             <strategyResource>HPS-Full.xml</strategyResource>
             <debug>false</debug>             
             <rmsTimeCut>8.0</rmsTimeCut>
-<!--            <rmsTimeCut>24.0</rmsTimeCut>-->
         </driver>    
         <driver name="EcalRunningPedestal" type="org.hps.recon.ecal.EcalRunningPedestalDriver">
             <logLevel>CONFIG</logLevel>
@@ -217,28 +142,27 @@
             <useTimestamps>false</useTimestamps>
             <useTruthTime>false</useTruthTime>
             <useRunningPedestal>true</useRunningPedestal>
-            <useTimeWalkCorrection>true</useTimeWalkCorrection>
+            <useTimeWalkCorrection>false</useTimeWalkCorrection>
             <emulateFirmware>true</emulateFirmware>
-            <emulateMode7>false</emulateMode7>
+            <emulateMode7>true</emulateMode7>
             <leadingEdgeThreshold>12</leadingEdgeThreshold>
             <nsa>100</nsa>
             <nsb>20</nsb>
-            <windowSamples>50</windowSamples>
             <nPeak>3</nPeak>
+            <useFit>true</useFit>
+            <fixShapeParameter>true</fixShapeParameter>
         </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> 
-            <clusterEnergyThreshold>0.200</clusterEnergyThreshold>
+            <hitEnergyThreshold>0.0075</hitEnergyThreshold>
+            <seedEnergyThreshold>0.050</seedEnergyThreshold> 
+            <clusterEnergyThreshold>0.100</clusterEnergyThreshold>
             <minTime>0.0</minTime>
             <timeWindow>25.0</timeWindow>
             <useTimeCut>true</useTimeCut>
             <writeRejectedHitCollection>false</writeRejectedHitCollection>
-        </driver>                
-        <!-- End of EngineeringRun2015FullRecon from Sho --> 
-           
+        </driver>                           
                       
         <driver name="TrackingMonitoring" type="org.hps.monitoring.drivers.trackrecon.TrackingReconPlots">         
         </driver>

Modified: java/trunk/tracking/src/main/resources/org/hps/recon/tracking/strategies/HPS-Full-StraightTracks.xml
 =============================================================================
--- java/trunk/tracking/src/main/resources/org/hps/recon/tracking/strategies/HPS-Full-StraightTracks.xml	(original)
+++ java/trunk/tracking/src/main/resources/org/hps/recon/tracking/strategies/HPS-Full-StraightTracks.xml	Thu Jul  9 11:15:39 2015
@@ -9,8 +9,8 @@
         <MinHits>4</MinHits>
         <MinConfirm>0</MinConfirm>
         
-        <MaxDCA>4.0</MaxDCA>
-        <MaxZ0>4.0</MaxZ0>
+        <MaxDCA>50.0</MaxDCA>
+        <MaxZ0>50.0</MaxZ0>
 
         <MaxChisq>2500.0</MaxChisq>
         <BadHitChisq>1000.0</BadHitChisq>

Modified: java/trunk/users/src/main/java/org/hps/users/mgraham/StraightTrackAnalysis.java
 =============================================================================
--- java/trunk/users/src/main/java/org/hps/users/mgraham/StraightTrackAnalysis.java	(original)
+++ java/trunk/users/src/main/java/org/hps/users/mgraham/StraightTrackAnalysis.java	Thu Jul  9 11:15:39 2015
@@ -26,16 +26,21 @@
 
     protected AIDA aida = AIDA.defaultInstance();
     private String mcSvtHitsName = "TrackerHits";
-    private String rawHitsName = "RawTrackerHitMaker_RawTrackerHits";
+//    private String rawHitsName = "RawTrackerHitMaker_RawTrackerHits";
+      private String rawHitsName = "SVTRawTrackerHits";
     private String clustersName = "StripClusterer_SiTrackerHitStrip1D";
     private final String helicalTrackMCRelationsCollectionName = "HelicalTrackMCRelations";
     private final String helicalTrackHitRelationsCollectionName = "HelicalTrackHitRelations";
     private final String rotatedHelicalTrackHitRelationsCollectionName = "RotatedHelicalTrackHitRelations";
     private String hthName = "HelicalTrackHits";
-    private String tracksName = "StraightTracks";
+    private String trackCollectionName = "StraightTracks";
 
     int nevents = 0;
 
+    public void setTrackCollectionName(String name){
+        this.trackCollectionName=name;
+    }
+    
     public void detectorChanged(Detector detector) {
         aida.tree().cd("/");
         IHistogram1D nSimHits = aida.histogram1D("Number of SVT Sim Hits", 25, 0, 25.0);
@@ -48,10 +53,10 @@
 
     public void process(EventHeader event) {
         nevents++;
-        if (!event.hasCollection(SimTrackerHit.class, mcSvtHitsName))
-            return;
-        List<SimTrackerHit> simHits = event.get(SimTrackerHit.class, mcSvtHitsName);
-        aida.histogram1D("Number of SVT Sim Hits").fill(simHits.size());
+//        if (!event.hasCollection(SimTrackerHit.class, mcSvtHitsName))
+//            return;
+//        List<SimTrackerHit> simHits = event.get(SimTrackerHit.class, mcSvtHitsName);
+//        aida.histogram1D("Number of SVT Sim Hits").fill(simHits.size());
         List<RawTrackerHit> rawHits = event.get(RawTrackerHit.class, rawHitsName);
         List<TrackerHit> clusters = event.get(TrackerHit.class, clustersName);
         List<TrackerHit> hths = event.get(TrackerHit.class, hthName);
@@ -78,7 +83,7 @@
         for (int i = 0; i < 6; i++)
             totLayers += hitInLayer[i];
         aida.histogram1D("Number of Layers Hit").fill(totLayers);
-        List<Track> tracks = event.get(Track.class, tracksName);
+        List<Track> tracks = event.get(Track.class, trackCollectionName);
         aida.histogram1D("Number of Tracks found").fill(tracks.size());
 
         //make some maps and relation tables        
@@ -122,8 +127,8 @@
 
         for (Track trk : tracks) {
 //            StraightTrack stght = (StraightTrack) trk;
-            aida.histogram1D("d0", 50, -2, 2).fill(trk.getTrackStates().get(0).getParameters()[0]);
-            aida.histogram1D("z0", 50, -2, 2).fill(trk.getTrackStates().get(0).getParameters()[3]);
+            aida.histogram1D("d0", 50, -50, 50).fill(trk.getTrackStates().get(0).getParameters()[0]);
+            aida.histogram1D("z0", 50, -50, 50).fill(trk.getTrackStates().get(0).getParameters()[3]);
             aida.histogram1D("xy slope", 50, -0.2, 0.25).fill(trk.getTrackStates().get(0).getParameters()[1]);
             aida.histogram1D("sz slope", 50, -0.25, 0.25).fill(trk.getTrackStates().get(0).getParameters()[4]);
             aida.histogram1D("track chi2 per ndf", 50, 0, 2).fill(trk.getChi2() / trk.getNDF());

Top of Message | Previous Page | Permalink

Advanced Options


Options

Log In

Log In
Get Password

Get Password
Search Archives

Search Archives
Subscribe or Unsubscribe

Subscribe or Unsubscribe

Archives

November 2017
August 2017
July 2017
January 2017
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
December 2013
November 2013

ATOM RSS1 RSS2



LISTSERV.SLAC.STANFORD.EDU

Secured by F-Secure Anti-Virus CataList Email List Search Powered by the LISTSERV Email List Manager

Privacy Notice, Security Notice and Terms of Use