Fix ignoreCollections in skims

recon/src/main/java/org/hps/recon/skims/FEESkimmer.java

@@ -1,5 +1,7 @@
 package org.hps.recon.skims;
 
+import java.util.Set; 
+
 import org.lcsim.event.EventHeader;
 
 
@@ -31,5 +33,7 @@ public FEESkimmer(String file) {
 	super(file, null); 
 	//        this(super.addFileExtension(file), null);
     }
-
+    public FEESkimmer(String file, Set<String> ignore) {
+	super(file, ignore); 
+    }
 }

recon/src/main/java/org/hps/recon/skims/MollerSkimmer.java

@@ -1,5 +1,7 @@
 package org.hps.recon.skims;
 
+import java.util.Set; 
+
 import org.lcsim.event.EventHeader;
 
 
@@ -32,5 +34,7 @@ public MollerSkimmer(String file) {
 	super(file, null); 
 	//        this(super.addFileExtension(file), null);
     }
-
+    public MollerSkimmer(String file, Set<String> ignore) {
+	super(file, ignore); 
+    }
 }

recon/src/main/java/org/hps/recon/skims/MultiSkimDriver.java

@@ -17,7 +17,7 @@
 public class MultiSkimDriver extends Driver {
 
     private static final Logger LOGGER = Logger.getLogger(MultiSkimDriver.class.getPackage().getName());
-    private Set<String> listIgnore = new HashSet<String>();
+    private Set<String> ignoreCollections = new HashSet<String>();
 
     //if this is true, an event will be written to each stream that it passes
     //if false, it will only go into the first stream it passes... so the ordering of the skim list matters.  
@@ -153,21 +153,19 @@ protected void detectorChanged(Detector detector) {
     private Skimmer setupSkimmer(String evtType, String outputFile, String paramFile){
 	Skimmer skm;
 	if(evtType.equals("v0"))
-	    skm=new V0Skimmer(outputFile);
+	    skm=new V0Skimmer(outputFile,ignoreCollections);
 	else if(evtType.equals("ThreeBody"))
-	    skm=new ThreeBodySkimmer(outputFile);
+	    skm=new ThreeBodySkimmer(outputFile,ignoreCollections);
 	else if(evtType.equals("FEE"))
-	    skm=new FEESkimmer(outputFile);
+	    skm=new FEESkimmer(outputFile,ignoreCollections);
 	else if(evtType.equals("Moller"))
-	    skm=new MollerSkimmer(outputFile);
+	    skm=new MollerSkimmer(outputFile,ignoreCollections);
 	else{
 	    System.out.println(this.getClass().getName()+":: in setupSkimmer:  invalid evtTrype = "+evtType);
 	    return null; 
 	}
 	if(!paramFile.equals("default"))
 	    skm.setParameters(paramFile);
-	if(listIgnore.size()>0)
-	    skm.setListIgnore(listIgnore); 
 	return skm;
 
 
@@ -201,8 +199,8 @@ public void setSkimFEE(boolean doSkim){
      public void setSkimMoller(boolean doSkim){
 	this.skimMoller=doSkim; 
      }
-     public void setIgnoreCollections(String[] ignoreCollections) {
-	 listIgnore.addAll(Arrays.asList(ignoreCollections));
+     public void setIgnoreCollections(String[] ignore) {
+	 ignoreCollections.addAll(Arrays.asList(ignore));
      }
 
 }

recon/src/main/java/org/hps/recon/skims/ThreeBodySkimmer.java

@@ -1,5 +1,7 @@
 package org.hps.recon.skims;
 
+import java.util.Set; 
+
 import org.lcsim.event.EventHeader;
 
 
@@ -30,5 +32,7 @@ public void setParameters(String parsFileName){
     public ThreeBodySkimmer(String file) {
 	super(file, null); 
     }
-
+    public ThreeBodySkimmer(String file, Set<String> ignore) {
+	super(file, ignore); 
+    }
 }

recon/src/main/java/org/hps/recon/skims/V0Skimmer.java

@@ -2,6 +2,7 @@
 import static java.lang.Math.abs;
 
 import java.util.List;
+import java.util.Set; 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -139,6 +140,9 @@ public boolean passSelection(EventHeader event){
     public V0Skimmer(String file) {
 	super(file, null); 
     }
+    public V0Skimmer(String file, Set<String> ignore) {
+	super(file, ignore); 
+    }
 
     @Override
     public void setParameters(String parsFileName){

steering-files/src/main/resources/org/hps/steering/production/StreamSkims.lcsim

@@ -17,6 +17,7 @@
         <!-- Driver to strip events -->
         <driver name="StripEvent"
                 type="org.hps.recon.skims.MultiSkimDriver">
+	  <ignoreCollections>FPGAData HelicalTrackHitRelations HelicalTrackHits HelicalTrackMCRelations KFGBLStripClusterData KFGBLStripClusterDataRelations ReadoutTimestamps RotatedHelicalTrackHitRelations RotatedHelicalTrackHits RotatedHelicalTrackMCRelations SVTFittedRawTrackerHits SVTShapeFitParameters SVTTrueHitRelations StripClusterer_SiTrackerHitStrip1D SVTRawTrackerHits FADCGenericHits HodoReadoutHits HodoCalHits EcalReadoutHits EcalUncalHits HodoGenericClusters VTPBank EcalClusters</ignoreCollections>
 	  <skimV0>true</skimV0>
 	  <skimThreeBody>false</skimThreeBody>
 	  <skimFEE>false</skimFEE>