Author: [log in to unmask]
Date: Mon Feb 23 17:34:42 2015
New Revision: 3551

Log:
Add method for creating expanded ID of correct size using the dict.

Modified:
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/identifier/IIdentifierHelper.java
    projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/identifier/IdentifierHelper.java

Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/identifier/IIdentifierHelper.java
 =============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/identifier/IIdentifierHelper.java	(original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/identifier/IIdentifierHelper.java	Mon Feb 23 17:34:42 2015
@@ -82,6 +82,8 @@
      */
     public int getFieldIndex(String fieldName);
     
+    public IExpandedIdentifier createExpandedIdentifier();
+    
     /**
      * Pack a subset of fields into an {@link IExpandedIdentifier}.
      * 

Modified: projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/identifier/IdentifierHelper.java
 =============================================================================
--- projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/identifier/IdentifierHelper.java	(original)
+++ projects/lcsim/trunk/detector-framework/src/main/java/org/lcsim/detector/identifier/IdentifierHelper.java	Mon Feb 23 17:34:42 2015
@@ -1,6 +1,5 @@
 package org.lcsim.detector.identifier;
 
-import java.util.List;
 
 /**
  * 
@@ -10,101 +9,70 @@
  * @version $Id: IdentifierHelper.java,v 1.16 2011/02/25 03:09:38 jeremy Exp $
  */
 
-public class IdentifierHelper
-implements IIdentifierHelper
-{
-    private IIdentifierDictionary iddict=null;
-       
+public class IdentifierHelper implements IIdentifierHelper {
+    private IIdentifierDictionary iddict = null;
+
     /*
-    public IExpandedIdentifier unpack( IIdentifier id, int start, int nfields)
-    {
-        return IdentifierUtil.unpack( iddict, id, start, nfields );        
+     * public IExpandedIdentifier unpack( IIdentifier id, int start, int nfields) { return IdentifierUtil.unpack( iddict, id, start, nfields ); }
+     * 
+     * public IExpandedIdentifier unpack( IIdentifier id, int start) { return IdentifierUtil.unpack( iddict, id, start ); }
+     * 
+     * public IExpandedIdentifier unpack(IIdentifier compact, List<Integer> indices) { return IdentifierUtil.unpack(iddict, compact, indices); }
+     */
+
+    public IdentifierHelper(IIdentifierDictionary iddict) {
+        this.iddict = iddict;
     }
 
-    public IExpandedIdentifier unpack( IIdentifier id, int start)
-    {
-        return IdentifierUtil.unpack( iddict, id, start );
-    }    
-    
-    public IExpandedIdentifier unpack(IIdentifier compact, List<Integer> indices)
-    {
-    	return IdentifierUtil.unpack(iddict, compact, indices);
-    }
-        */
-    
-    public IdentifierHelper( IIdentifierDictionary iddict )
-    {
-        this.iddict = iddict;
-    }
-    
-    public IIdentifierDictionary getIdentifierDictionary()
-    {
+    public IIdentifierDictionary getIdentifierDictionary() {
         return iddict;
     }
 
-    public IIdentifier pack( IExpandedIdentifier id )
-    {        
-        //return IdentifierUtil.pack(getIdentifierDictionary(), id );
+    public IIdentifier pack(IExpandedIdentifier id) {
+        // return IdentifierUtil.pack(getIdentifierDictionary(), id );
         return iddict.pack(id);
     }
 
-    public IExpandedIdentifier unpack( IIdentifier id )
-    {
-        //return IdentifierUtil.unpack( iddict, id );
+    public IExpandedIdentifier unpack(IIdentifier id) {
+        // return IdentifierUtil.unpack( iddict, id );
         return iddict.unpack(id);
-    }    
-    
+    }
+
     /*
-    public int getValue( IIdentifier compact, IIdentifierField desc )
-    {
-        //return IdentifierUtil.getValue( compact, desc );
-        return iddict.getFieldValue(compact, desc.getLabel());
-    }
-    */
-    
-    public int getValue( IIdentifier compact, int idx )
-    {
-        //return IdentifierUtil.getValue( iddict, compact, field );
+     * public int getValue( IIdentifier compact, IIdentifierField desc ) { //return IdentifierUtil.getValue( compact, desc ); return iddict.getFieldValue(compact, desc.getLabel()); }
+     */
+
+    public int getValue(IIdentifier compact, int idx) {
+        // return IdentifierUtil.getValue( iddict, compact, field );
         return iddict.getFieldValue(compact, idx);
     }
-    
+
     /*
-    public void setValue(IExpandedIdentifier expid, String field, int value)
-    {
-        expid.setValue(getFieldIndex(field), value);
+     * public void setValue(IExpandedIdentifier expid, String field, int value) { expid.setValue(getFieldIndex(field), value); }
+     * 
+     * public void setValue(IExpandedIdentifier expid, int index, int value) { expid.setValue(index, value); }
+     */
+
+    public int getFieldIndex(String fieldName) {
+        return iddict.getFieldIndex(fieldName);
+    }
+
+    public boolean hasField(String fieldName) {
+        return iddict.hasField(fieldName);
+    }
+
+    public int getValue(IIdentifier compact, String field) {
+        // return IdentifierUtil.getValue( iddict, compact, field );
+        return iddict.getField(field).unpack(compact);
     }
     
-    public void setValue(IExpandedIdentifier expid, int index, int value)
-    {
-        expid.setValue(index, value);
+    public IExpandedIdentifier createExpandedIdentifier() {
+        return new ExpandedIdentifier(getIdentifierDictionary().getNumberOfFields());
     }
-    */
-    
-    public int getFieldIndex(String fieldName)
-    {
-    	return iddict.getFieldIndex(fieldName);
-    }
-    
-    public boolean hasField(String fieldName)
-    {
-    	return iddict.hasField(fieldName);
-    }
-    
-    public int getValue( IIdentifier compact, String field )
-    {
-        //return IdentifierUtil.getValue( iddict, compact, field );
-        return iddict.getField(field).unpack(compact);
-    }    
-    
+
     /*
-    public IIdentifier pack(IExpandedIdentifier id, int start)
-    {
-        return IdentifierUtil.pack( iddict, id, start );
-    }
-    
-    public IIdentifier pack(IExpandedIdentifier id, int start, int nfields)
-    {
-        return IdentifierUtil.pack( iddict, id, start, nfields );
-    } 
-    */   
+     * public IIdentifier pack(IExpandedIdentifier id, int start) { return IdentifierUtil.pack( iddict, id, start ); }
+     * 
+     * public IIdentifier pack(IExpandedIdentifier id, int start, int nfields) { return IdentifierUtil.pack( iddict, id, start, nfields ); }
+     */
 }

########################################################################
Use REPLY-ALL to reply to list

To unsubscribe from the LCDET-SVN list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCDET-SVN&A=1