diff -u -r1.31 -r1.32
--- NonTrivialPFA.java	5 Dec 2007 23:04:53 -0000	1.31
+++ NonTrivialPFA.java	16 Jan 2008 19:19:38 -0000	1.32
@@ -70,10 +70,16 @@

     }
 
     boolean m_writeLikelihood = false;

+    String m_writeLikelihoodFilename = "likelihood.bin";
+    String m_outputReconstructedParticleListName = "PFAReconstructedParticles";

     public NonTrivialPFA(boolean writeLikelihood)
     {

-        System.out.println("NonTrivialPFA called, with write mode = "+writeLikelihood);

         m_writeLikelihood = writeLikelihood;

+	if (writeLikelihood) {
+	    System.out.println("NonTrivialPFA called in special write-likelihood mode. Will write out to "+m_writeLikelihoodFilename);
+	} else {
+	    System.out.println("NonTrivialPFA called in regular reconstruction mode.");
+	}

 	
 	// Book-keeping
 	// ------------

@@ -411,7 +417,7 @@

 	    addMerger(mergeThese, eventOutputParticles);
 
 	    // Flush the output list to make sure it's LCIO-compatible

-	    String eventOutputParticlesFlushed = "PFAReconstructedParticles";

+	    String eventOutputParticlesFlushed = m_outputReconstructedParticleListName;

 	    String eventOutputClustersFromFlushedParticles = "flushedClusters";
 	    add(new FlushReconstructedParticlesDriver(eventOutputParticles, eventOutputParticlesFlushed, eventOutputClustersFromFlushedParticles));
 

@@ -522,7 +528,7 @@

     // that the right output lists get created.
     protected void addEmptyMuonFinder(String prefix, String inputHitMapEcal, String inputHitMapHcal, String inputTrackList, String outputMuonClusterList, String outputHitMapEcal, String outputHitMapHcal, String mcListName, String outputTrackList, String outputParticleList)
     {

-	System.out.println("WARNING: Not using a muon finder");

+	System.out.println("NonTrivialPFA: Not using a dedicated muon finder");

 
 	// Nothing will pass this filter!
         add(new ListFilterDriver(new ParticlePDGDecision(1393174826), mcListName, prefix+"MCParticlesMuonsOnly"));

@@ -788,7 +794,7 @@

 	LikelihoodFindingStructuralDriver likelihoodWriter = new LikelihoodFindingStructuralDriver(eval, inputClusterList, inputMIPList, inputClumpList);
 	likelihoodWriter.initializeClusterAssociator( inputHitListsForAssociator, inputClusterListsForAssociator, mcListName, prefix+"AssocInfoParticlesToComponents", prefix+"AssocInfoComponentsToParticles" );
 	add(likelihoodWriter);

-	LikelihoodEvaluatorCheckpointDriver checkpoint = new LikelihoodEvaluatorCheckpointDriver(eval, 10);

+	LikelihoodEvaluatorCheckpointDriver checkpoint = new LikelihoodEvaluatorCheckpointDriver(eval, 10, m_writeLikelihoodFilename);

 	checkpoint.setDebug(true);
 	add(checkpoint);
     }

diff -u -r1.3 -r1.4
--- LikelihoodEvaluatorCheckpointDriver.java	4 Sep 2007 17:27:57 -0000	1.3
+++ LikelihoodEvaluatorCheckpointDriver.java	16 Jan 2008 19:19:38 -0000	1.4
@@ -9,10 +9,12 @@

     protected LikelihoodEvaluator m_eval = null;
     protected int m_frequency = -1;
     protected boolean m_debug = false;

+    protected String m_filename = null;

-    public LikelihoodEvaluatorCheckpointDriver(LikelihoodEvaluator eval, int frequency) {

+    public LikelihoodEvaluatorCheckpointDriver(LikelihoodEvaluator eval, int frequency, String filename) {

         m_eval = eval;
 	m_frequency = frequency;

+	m_filename = filename;

     }
 
     protected int m_count = 0;

@@ -20,8 +22,7 @@

         m_count++;
 	if (m_eval != null) {
 	    if (m_frequency>0 && m_count % m_frequency == 0) {

-                m_eval.writeToFile("likelihood.bin");
-		//m_eval.makePlots("likelihoodDistributions.aida");

+                m_eval.writeToFile(m_filename);

 		if (m_debug) {
 		    System.out.println("DEBUG: Wrote likelihood distribution at checkpoint of "+m_count+" events.");
 		}

@@ -30,8 +31,7 @@

     }
 
     public void suspend() {

-	m_eval.writeToFile("likelihood.bin");
-	//m_eval.makePlots("likelihoodDistributions.aida");

+	m_eval.writeToFile(m_filename);

 	super.suspend();
     }