Print

Print


Author: [log in to unmask]
Date: Tue Feb  3 15:58:52 2015
New Revision: 2035

Log:
replace deprecated method

Modified:
    java/trunk/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java
    java/trunk/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java
    java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java
    java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java
    java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java
    java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java
    java/trunk/evio/src/main/java/org/hps/evio/TriggerDataWriter.java

Modified: java/trunk/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java
 =============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java	(original)
+++ java/trunk/evio/src/main/java/org/hps/evio/AbstractSvtEvioReader.java	Tue Feb  3 15:58:52 2015
@@ -149,7 +149,7 @@
 		}
 
 		// Loop over the SVT data banks
-		for (BaseStructure dataBank : svtBanks.get(0).getChildren()) {
+		for (BaseStructure dataBank : svtBanks.get(0).getChildrenList()) {
 
 			// Get the bank tag and check whether it's within the allowable
 			// ranges. If not, throw an exception

Modified: java/trunk/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java
 =============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java	(original)
+++ java/trunk/evio/src/main/java/org/hps/evio/BasicEvioFileReader.java	Tue Feb  3 15:58:52 2015
@@ -55,7 +55,7 @@
         System.out.println(indent + "Bank has " + bank.getChildCount() + " sub-banks.");
         System.out.format(indent + "Bank tag: 0x%x length: %d type: %s num: %d\n", bank.getHeader().getTag(), bank.getHeader().getLength(), bank.getHeader().getDataType(), bank.getHeader().getNumber());
         if (bank.getChildCount() > 0) {
-            for (BaseStructure child : bank.getChildren()) {
+            for (BaseStructure child : bank.getChildrenList()) {
                 printBank(child, indent + "\t");
             }
         }

Modified: java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java
 =============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java	(original)
+++ java/trunk/evio/src/main/java/org/hps/evio/ECalEvioReader.java	Tue Feb  3 15:58:52 2015
@@ -97,9 +97,8 @@
         genericHits = new ArrayList<FADCGenericHit>();
         extraDataList = new ArrayList<HitExtraData>();
         extraDataRelations = new ArrayList<LCRelation>();
-        hitClass = Object.class;
         int flags = 0;
-        for (BaseStructure bank : event.getChildren()) {
+        for (BaseStructure bank : event.getChildrenList()) {
             BaseStructureHeader header = bank.getHeader();
             int crateBankTag = header.getTag();
             int crate = 0;
@@ -115,7 +114,7 @@
                         System.out.println("ECal bank tag: " + header.getTag() + "; childCount: " + bank.getChildCount());
                     }
                     try {
-                        for (BaseStructure slotBank : bank.getChildren()) {
+                        for (BaseStructure slotBank : bank.getChildrenList()) {
 //                            if (isTriggerBank(slotBank.getHeader().getTag(), lcsimEvent.getRunNumber()) != 0) {
 //                                if (debug) {
 //                                    int[] data = slotBank.getIntData();

Modified: java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java
 =============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java	(original)
+++ java/trunk/evio/src/main/java/org/hps/evio/ECalHitWriter.java	Tue Feb  3 15:58:52 2015
@@ -129,7 +129,7 @@
         BaseStructure topBank = null;
         BaseStructure botBank = null;
         // Do these banks already exist?
-        for (BaseStructure bank : builder.getEvent().getChildren()) {
+        for (BaseStructure bank : builder.getEvent().getChildrenList()) {
             switch (bank.getHeader().getTag()) {
                 case ECAL_TOP_BANK_TAG:
                     topBank = bank;

Modified: java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java
 =============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java	(original)
+++ java/trunk/evio/src/main/java/org/hps/evio/LCSimTestRunEventBuilder.java	Tue Feb  3 15:58:52 2015
@@ -115,7 +115,7 @@
         List<AbstractIntData> triggerList = getTriggerData(evioEvent);
 
         if (evioEvent.getChildCount() > 0) {
-            for (BaseStructure bank : evioEvent.getChildren()) {
+            for (BaseStructure bank : evioEvent.getChildrenList()) {
                 if (bank.getHeader().getTag() == EvioEventConstants.EVENTID_BANK_TAG) {
                     eventID = bank.getIntData();
                 }

Modified: java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java
 =============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java	(original)
+++ java/trunk/evio/src/main/java/org/hps/evio/SVTEvioReader.java	Tue Feb  3 15:58:52 2015
@@ -99,7 +99,7 @@
         List<RawTrackerHit> hits = new ArrayList<RawTrackerHit>();
 
         boolean foundBank = false;
-        for (BaseStructure crateBank : event.getChildren()) {
+        for (BaseStructure crateBank : event.getChildrenList()) {
             int crateTag = crateBank.getHeader().getTag();
 
             // Process only events inside the SVT Bank

Modified: java/trunk/evio/src/main/java/org/hps/evio/TriggerDataWriter.java
 =============================================================================
--- java/trunk/evio/src/main/java/org/hps/evio/TriggerDataWriter.java	(original)
+++ java/trunk/evio/src/main/java/org/hps/evio/TriggerDataWriter.java	Tue Feb  3 15:58:52 2015
@@ -29,7 +29,7 @@
         // Make a new bank for this crate.
         BaseStructure topBank = null;
         // Does this bank already exist?
-        for (BaseStructure bank : builder.getEvent().getChildren()) {
+        for (BaseStructure bank : builder.getEvent().getChildrenList()) {
             if (bank.getHeader().getTag() == EventConstants.ECAL_TOP_BANK_TAG) {
                 topBank = bank;
                 break;