lcsim/src/org/lcsim/mc/fast/cluster/ronan
diff -u -r1.8 -r1.9
--- ReconCluster.java 4 Apr 2007 22:16:28 -0000 1.8
+++ ReconCluster.java 17 Dec 2008 18:25:21 -0000 1.9
@@ -7,7 +7,7 @@
import java.util.Random;
import org.lcsim.event.Cluster;
-abstract class ReconCluster implements Cluster
+public abstract class ReconCluster implements Cluster
{
protected ClusterResolutionTables parm;
protected Particle mcp;
lcsim/src/org/lcsim/mc/fast/tracking/fix
diff -u -r1.1 -r1.2
--- FastMCTrackFactory.java 29 Nov 2007 21:29:35 -0000 1.1
+++ FastMCTrackFactory.java 17 Dec 2008 18:25:22 -0000 1.2
@@ -1,5 +1,5 @@
/**
- * @version $Id: FastMCTrackFactory.java,v 1.1 2007/11/29 21:29:35 jstrube Exp $
+ * @version $Id: FastMCTrackFactory.java,v 1.2 2008/12/17 18:25:22 jstrube Exp $
*/
package org.lcsim.mc.fast.tracking.fix;
@@ -62,13 +62,14 @@
* field.
*
*/
- @Deprecated
public FastMCTrackFactory(String detectorName, double field, boolean beamConstraint) {
_Bz = field;
_manager = ConditionsManager.defaultInstance();
try {
+ // new detector, run 0
_manager.setDetector(detectorName, 0);
} catch (ConditionsManager.ConditionsNotFoundException e) {
+ System.err.print("Conditions for detector " + detectorName + " not found!");
}
ConditionsSet trackParameters = _manager.getConditions("TrackParameters");
ConditionsSet simpleTrack = _manager.getConditions("SimpleTrack");
lcsim/src/org/lcsim/util/loop
diff -u -r1.12 -r1.13
--- LCIODriver.java 15 Dec 2008 21:10:09 -0000 1.12
+++ LCIODriver.java 17 Dec 2008 18:25:22 -0000 1.13
@@ -30,12 +30,12 @@
public LCIODriver(String file)
{
- this(file,null);
+ this(file, Collections.EMPTY_SET);
}
public LCIODriver(File file)
{
- this(file,null);
+ this(file, Collections.EMPTY_SET);
}
public LCIODriver(String file, Collection<String> listIgnore)
@@ -47,7 +47,9 @@
{
try
{
- this.writer = new LCIOWriter(file,listIgnore == null ? Collections.EMPTY_SET : listIgnore);
+ this.writer = new LCIOWriter(file);
+ if (listIgnore != Collections.EMPTY_SET)
+ this.writer.addAllIgnore(listIgnore);
}
catch (IOException x)
{
@@ -73,11 +75,15 @@
public void setIgnoreCollections(String[] ignoreCollections)
{
listIgnore = Arrays.asList(ignoreCollections);
+ if (writer != null)
+ writer.addAllIgnore(listIgnore);
}
public void setWriteOnlyCollections(String [] keepCollections)
{
listKeep = Arrays.asList(keepCollections);
+ if (writer != null)
+ writer.addAllWriteOnly(listKeep);
}
public LCIOWriter getWriter()
