Author: [log in to unmask] Date: Wed Nov 11 09:37:32 2015 New Revision: 3954 Log: add beamspot parameters Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1_Pass2.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullReconMC_Pass2.lcsim java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/EngineeringRun2015FullRecon_Pass2_Gbl.lcsim Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1_Pass2.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1_Pass2.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/readout/EngineeringRun2015TrigSingles1_Pass2.lcsim Wed Nov 11 09:37:32 2015 @@ -12,7 +12,7 @@ <driver name="EcalReadout"/> <driver name="EcalConverter"/> <driver name="EcalClustererGTP"/> - <driver name="SinglesTrigger1"/> + <driver name="DummyTrigger"/> <driver name="SimpleSVTReadout" /> <driver name="TestRunReconToLcio"/> <driver name="AidaSaveDriver"/> @@ -54,6 +54,7 @@ <seedEnergyThreshold>0.050</seedEnergyThreshold> <logLevel>SEVERE</logLevel> </driver> + <driver name="DummyTrigger" type="org.hps.readout.ecal.DummyTriggerDriver"/> <driver name="SinglesTrigger1" type="org.hps.readout.ecal.SinglesTriggerDriver"> <!-- Hits Per Cluster Min: 3 Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullReconMC_Pass2.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullReconMC_Pass2.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/recon/EngineeringRun2015FullReconMC_Pass2.lcsim Wed Nov 11 09:37:32 2015 @@ -16,6 +16,9 @@ <driver name="ReconClusterer" /> <driver name="GTPOnlineClusterer" /> <driver name="CopyCluster" /> + <!--<driver name="TriggerTurnOnDriver"/>--> + <!--<driver name="TriggerTurnOnSSPDriver"/>--> + <!-- SVT reconstruction drivers --> <driver name="RawTrackerHitSensorSetup"/> <driver name="RawTrackerHitFitterDriver" /> @@ -33,21 +36,21 @@ name of the tracks found with this strategy will be "Tracks_s456_c3_e21" --> - <driver name="TrackReconSeed456Conf3Extd21"/> + <!--<driver name="TrackReconSeed456Conf3Extd21"/>--> <!-- Will run track finding algorithm using layers 123 as a seed, layer 4 to confirm and layers 5 and 6 to extend. The collection name of the tracks found with this strategy will be "Tracks_s123_c4_e56" --> - <driver name="TrackReconSeed123Conf4Extd56"/> + <!--<driver name="TrackReconSeed123Conf4Extd56"/>--> <!-- Will run track finding algorithm using layers 123 as a seed, layer 5 to confirm and layers 4 and 6 to extend. The collection name of the tracks found with this strategy will be "Tracks_s123_c5_e46" --> - <driver name="TrackReconSeed123Conf5Extd46"/> + <!--<driver name="TrackReconSeed123Conf5Extd46"/>--> <!-- TrackDataDriver needs to be run before ReconParticleDriver so the ReconstructedParticle types are properly set. @@ -119,7 +122,17 @@ <rmsTimeCut>8.0</rmsTimeCut> </driver> <driver name="MergeTrackCollections" type="org.hps.recon.tracking.MergeTrackCollections" /> - <driver name="GBLOutputDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver"/> + <driver name="GBLOutputDriver" type="org.hps.recon.tracking.gbl.GBLOutputDriver"> + <debug>0</debug> + <isMC>false</isMC> + <gblFileName>${outputFile}.gbl</gblFileName> + <addBeamspot>false</addBeamspot> + <beamspotScatAngle>0.005</beamspotScatAngle> + <beamspotWidthZ>0.05</beamspotWidthZ> + <beamspotWidthY>0.2</beamspotWidthY> + <beamspotTiltZOverY>0.26</beamspotTiltZOverY> + <beamspotPosition>0.0 -0.11 -0.05</beamspotPosition> + </driver> <driver name="GBLRefitterDriver" type="org.hps.recon.tracking.gbl.HpsGblRefitter"/> <driver name="EcalRawConverter" type="org.hps.recon.ecal.EcalRawConverterDriver"> <ecalCollectionName>EcalCalHits</ecalCollectionName> @@ -153,5 +166,10 @@ <driver name="AidaSaveDriver" type="org.lcsim.job.AidaSaveDriver"> <outputFileName>${outputFile}.root</outputFileName> </driver> + <driver name="TriggerTurnOnDriver" type="org.hps.analysis.trigger.TriggerTurnOnDriver"> + <isMC>True</isMC> + </driver> + <driver name="TriggerTurnOnSSPDriver" type="org.hps.analysis.trigger.TriggerTurnOnSSPDriver"/> + </drivers> </lcsim> Modified: java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/EngineeringRun2015FullRecon_Pass2_Gbl.lcsim ============================================================================= --- java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/EngineeringRun2015FullRecon_Pass2_Gbl.lcsim (original) +++ java/trunk/steering-files/src/main/resources/org/hps/steering/users/phansson/EngineeringRun2015FullRecon_Pass2_Gbl.lcsim Wed Nov 11 09:37:32 2015 @@ -144,6 +144,12 @@ <debug>0</debug> <isMC>false</isMC> <gblFileName>${outputFile}.gbl</gblFileName> + <addBeamspot>false</addBeamspot> + <beamspotScatAngle>0.005</beamspotScatAngle> + <beamspotWidthZ>0.05</beamspotWidthZ> + <beamspotWidthY>0.2</beamspotWidthY> + <beamspotTiltZOverY>0.26</beamspotTiltZOverY> + <beamspotPosition>0.0 -0.11 -0.05</beamspotPosition> </driver> <driver name="GBLRefitterDriver" type="org.hps.recon.tracking.gbl.HpsGblRefitter"> <debug>false</debug>