3 removed + 2 modified, total 5 files
lcsim/src/org/lcsim/event
diff -N MCCluster.java
--- MCCluster.java 21 Feb 2006 20:35:08 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-package org.lcsim.event;
-
-/** The LCIO MC cluster.
- *
- * @author Guilherme Lima
- * @version $Id: MCCluster.java,v 1.2 2006/02/21 20:35:08 tonyj Exp $
- */
-
-public interface MCCluster extends Cluster
-{
- public MCParticle getMCParticle();
-}
lcsim/src/org/lcsim/recon/cluster/cheat
diff -u -r1.4 -r1.5
--- CheatCluster.java 21 Feb 2006 20:32:52 -0000 1.4
+++ CheatCluster.java 21 Jun 2006 17:10:38 -0000 1.5
@@ -1,13 +1,13 @@
package org.lcsim.recon.cluster.cheat;
import org.lcsim.recon.cluster.util.BasicCluster;
-import org.lcsim.event.MCCluster;
+import org.lcsim.event.Cluster;
import org.lcsim.event.MCParticle;
/**
* Add the MCParticle to BasicCluster
*/
-public class CheatCluster extends BasicCluster implements MCCluster
+public class CheatCluster extends BasicCluster implements Cluster
{
private final MCParticle particle;
lcsim/src/org/lcsim/util/lcio
diff -u -r1.9 -r1.10
--- HandlerManager.java 19 Jun 2006 19:04:09 -0000 1.9
+++ HandlerManager.java 21 Jun 2006 17:10:38 -0000 1.10
@@ -26,7 +26,6 @@
register(new SIOSimCalorimeterHitBlockHandler());
register(new SIOSimTrackerHitBlockHandler());
register(new SIOMCParticleBlockHandler());
- register(new SIOMCClusterBlockHandler());
register(new SIOClusterBlockHandler());
register(new SIOTPCHitBlockHandler());
register(new SIOTrackerHitBlockHandler());
lcsim/src/org/lcsim/util/lcio
diff -N SIOMCCluster.java
--- SIOMCCluster.java 20 Feb 2006 22:24:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-package org.lcsim.util.lcio;
-
-import hep.lcd.io.sio.SIOInputStream;
-import hep.lcd.io.sio.SIOOutputStream;
-import hep.lcd.io.sio.SIORef;
-import java.io.IOException;
-
-import org.lcsim.event.MCParticle;
-import org.lcsim.event.MCCluster;
-
-/**
- * Class used to read MCClusters from persistent media
- * @author Guilherme Lima
- */
-public class SIOMCCluster extends SIOCluster implements MCCluster
-{
- private MCParticle _mcparticle = null;
- private SIORef _tempMCParticle = null;
-
- SIOMCCluster(SIOInputStream in, int flag, int version) throws IOException {
- super(in,flag,version);
- // read MCParticle pointer
- _tempMCParticle = in.readPntr();
- }
-
- public MCParticle getMCParticle() {
- if(_mcparticle==null) {
- _mcparticle = (MCParticle)_tempMCParticle.getObject();
- }
- return _mcparticle;
- }
-
- static void write(MCCluster cluster, SIOOutputStream out, int flag) throws IOException
- {
- // stream out the base class first
- SIOCluster.write(cluster,out,flag);
- // then the MCParticle
- MCParticle mcp = cluster.getMCParticle();
- out.writePntr( mcp );
- }
-}
lcsim/src/org/lcsim/util/lcio
diff -N SIOMCClusterBlockHandler.java
--- SIOMCClusterBlockHandler.java 20 Feb 2006 22:24:57 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,27 +0,0 @@
-package org.lcsim.util.lcio;
-
-import hep.lcd.io.sio.SIOInputStream;
-import hep.lcd.io.sio.SIOOutputStream;
-import java.io.IOException;
-
-import org.lcsim.event.MCCluster;
-
-/**
- * Block handler for Monte Carlo clusters
- * @author Guilherme Lima
- */
-class SIOMCClusterBlockHandler extends AbstractBlockHandler
-{
- public String getType() { return "MCCluster"; }
- public Class getClassForType() { return MCCluster.class; }
- void addCollectionElements(LCIOEvent event, LCIOCollection collection, SIOInputStream in, int n, int version) throws IOException
- {
- for (int i = 0; i < n; i++)
- collection.add(new SIOMCCluster(in, collection.getFlags(), version));
- }
-
- void writeCollectionElement(Object element, SIOOutputStream out, int flags) throws IOException
- {
- SIOMCCluster.write((MCCluster) element, out, flags);
- }
-}
CVSspam 0.2.8