Commit in hps-java/src/main on MAIN | |||
java/org/lcsim/hps/recon/particle/ReconParticleDriver.java | +5 | -2 | 1.1 -> 1.2 |
java/org/lcsim/hps/recon/vertexing/BilliorVertexer.java | +4 | -3 | 1.2 -> 1.3 |
resources/org/lcsim/hps/steering/users/mgraham/ReconParticleBuilder.lcsim | +57 | added 1.1 | |
+66 | -5 |
A couple of minor fixes to ReconParticleDriver
diff -u -r1.1 -r1.2 --- ReconParticleDriver.java 12 Mar 2013 23:25:59 -0000 1.1 +++ ReconParticleDriver.java 13 Mar 2013 19:24:20 -0000 1.2 @@ -149,6 +149,7 @@
for (HPSEcalCluster cluster : clusters) { ReconstructedParticle particle = new BaseReconstructedParticle(); particle.addCluster(cluster);
+ reconParticles.add(particle);
} }
@@ -169,8 +170,10 @@
for (ReconstructedParticle pos : positrons) { for (ReconstructedParticle ele : electrons) {
- BilliorTrack btEle = getBilliorTrack((SeedTrack) ele); - BilliorTrack btPos = getBilliorTrack((SeedTrack) pos);
+ SeedTrack eleTrack=(SeedTrack) ele.getTracks().get(0); + SeedTrack posTrack=(SeedTrack) pos.getTracks().get(0); + BilliorTrack btEle = getBilliorTrack( eleTrack); + BilliorTrack btPos = getBilliorTrack( posTrack);
List<BilliorTrack> btlist = new ArrayList<BilliorTrack>(); btlist.add(btEle); btlist.add(btPos);
diff -u -r1.2 -r1.3 --- BilliorVertexer.java 12 Mar 2013 23:26:00 -0000 1.2 +++ BilliorVertexer.java 13 Mar 2013 19:24:20 -0000 1.3 @@ -13,7 +13,7 @@
import org.lcsim.constants.Constants; /**
- * @version $Id: BilliorVertexer.java,v 1.2 2013/03/12 23:26:00 mgraham Exp $
+ * @version $Id: BilliorVertexer.java,v 1.3 2013/03/13 19:24:20 mgraham Exp $
* @version Vertex tracks using least-squares method laid out by billior etal used in the HPS Java package. */ public class BilliorVertexer {
@@ -85,13 +85,14 @@
Hep3Vector pFit=new BasicHep3Vector(this.getFittedMomentum(i)); pFitMap.put(i, pFit); }
- return new BilliorVertex((Hep3Vector)_vertexPosition,_covVtx,_chiSq,getInvMass(),pFitMap,_constraintType);
+ Hep3Vector vert=new BasicHep3Vector(_vertexPosition.e(0, 0),_vertexPosition.e(1, 0),_vertexPosition.e(2, 0)); + return new BilliorVertex(vert,_covVtx,_chiSq,getInvMass(),pFitMap,_constraintType);
} public BilliorVertex fitFastVertex(List<BilliorTrack> tracks) { _ntracks = tracks.size(); fastVertex(tracks);
-
+ Hep3Vector vert=new BasicHep3Vector(_vertexPosition.e(0, 0),_vertexPosition.e(1, 0),_vertexPosition.e(2, 0));
return new BilliorVertex((Hep3Vector)_vertexPosition,_covVtx,_chiSq,getInvMass()); }
diff -N ReconParticleBuilder.lcsim --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ ReconParticleBuilder.lcsim 13 Mar 2013 19:24:20 -0000 1.1 @@ -0,0 +1,57 @@
+<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="CalibrationDriver"/> + <driver name="RawTrackerHitSensorSetup"/> + <driver name="RawTrackerHitFitterDriver" /> + <driver name="TrackerHitDriver"/> + <driver name="HelicalTrackHitDriver"/> + <driver name="TrackerReconDriver"/> + <driver name="EcalRawConverter" /> + <driver name="EcalClusterer" /> + <driver name="ReconParticle" /> + <driver name="LCIOWriter"/> + </execute> + <drivers> + <driver name="CalibrationDriver" type="org.lcsim.hps.monitoring.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="RawTrackerHitFitterDriver" type="org.lcsim.hps.recon.tracking.HPSRawTrackerHitFitterDriver"> + <fitAlgorithm>Analytic</fitAlgorithm> + <correctT0Shift>true</correctT0Shift> + </driver> + <driver name="TrackerHitDriver" type="org.lcsim.hps.users.mgraham.DataTrackerHitDriver" /> + <driver name="HelicalTrackHitDriver" + type="org.lcsim.hps.recon.tracking.HelicalTrackHitDriver"> + <debug>false</debug> + <layerGeometryType>Common</layerGeometryType> + <maxSeperation>20.0</maxSeperation> + <tolerance>1.0</tolerance> + </driver> + <driver name="TrackerReconDriver" + type="org.lcsim.hps.recon.tracking.TrackerReconDriver"> + <debug>false</debug> + </driver> + <driver name="EcalRawConverter" type="org.lcsim.hps.recon.ecal.EcalRawConverterDriver"> + <ecalCollectionName>EcalCalHits</ecalCollectionName> + </driver> + <driver name="EcalClusterer" type="org.lcsim.hps.recon.ecal.EcalClusterer"> + <ecalName>Ecal</ecalName> + <ecalCollectionName>EcalCalHits</ecalCollectionName> + </driver> + + <driver name="ReconParticle" type="org.lcsim.hps.recon.particle.ReconParticleDriver"> + </driver> + + <driver name="LCIOWriter" + type="org.lcsim.util.loop.LCIODriver"> + <outputFilePath>${outputFile}.slcio</outputFilePath> + </driver> + </drivers> +</lcsim>
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