Print

---

Author: [log in to unmask]
Date: Wed Feb 11 11:46:11 2015
New Revision: 2104

Log:
Fix conditions initialization problem and revert r2103.

Modified:
    java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java
    java/trunk/evio/src/test/java/org/hps/evio/SvtEvioReaderTest.java

Modified: java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java
 =============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java	(original)
+++ java/trunk/evio/src/main/java/org/hps/evio/LCSimEngRunEventBuilder.java	Wed Feb 11 11:46:11 2015
@@ -28,7 +28,7 @@
     public LCSimEngRunEventBuilder() {
         ecalReader.setTopBankTag(0x25);
         ecalReader.setBotBankTag(0x27);
-        //svtReader = new SvtEvioReader(); 
+        svtReader = new SvtEvioReader(); 
         sspCrateBankTag = 0x2E; //A.C. modification after Sergey's confirmation
         sspBankTag = 0xe10c;
         intBanks = new ArrayList<IntBankDefinition>();
@@ -68,7 +68,6 @@
             Logger.getLogger(this.getClass().getName()).log(Level.SEVERE, "Error making ECal hits", e);
         }
 
-        // Commented out for now while SVT is not implemented.  --JM
         // Make SVT RawTrackerHits
         // try {
         // svtReader.makeHits(evioEvent, lcsimEvent);

Modified: java/trunk/evio/src/test/java/org/hps/evio/SvtEvioReaderTest.java
 =============================================================================
--- java/trunk/evio/src/test/java/org/hps/evio/SvtEvioReaderTest.java	(original)
+++ java/trunk/evio/src/test/java/org/hps/evio/SvtEvioReaderTest.java	Wed Feb 11 11:46:11 2015
@@ -30,11 +30,10 @@
 		EvioReader evioReader = new EvioReader(evioFile); 
 	
 		// Instantiate the SVT EVIO reader
-		//SvtEvioReader svtReader = new SvtEvioReader(); 
+		SvtEvioReader svtReader = new SvtEvioReader(); 
 
 		// Setup the database conditions 
-		DatabaseConditionsManager conditionsManager = new DatabaseConditionsManager(); 
-		conditionsManager.setXmlConfig("/org/hps/conditions/config/conditions_dev.xml"); 
+		DatabaseConditionsManager conditionsManager = new DatabaseConditionsManager();  
 		conditionsManager.setDetector("HPS-Proposal2014-v8-2pt2", 0); 
 
 		// Instantiate the event builder
@@ -59,7 +58,7 @@
 			System.out.println("[ " + this.getClass().getSimpleName() + " ]: Created LCSim event # " + lcsimEvent.getEventNumber()); 	
 
 			// Process the event using the SVT evio reader
-			//svtReader.processEvent(evioEvent, lcsimEvent);  
+			svtReader.processEvent(evioEvent, lcsimEvent);  
 		}
 	}
 }