LISTSERV 16.5 - LCD-CVS Archives

+ /** + * Add a collection to the event. + * @param name The name used to stored this collection in the event. + * @param collection The data collection + * @param type The class of objects stored in the collection. + * @param flags The LCIO flags associated with the collection. + * @param readoutName The name of the readout to be used to decode hits in this collection + */ + public void put(String name, List collection, Class type, int flags, String readoutName); +

+ StringBuffer tableText = new StringBuffer(); + tableText.append("Collection: ").append(meta.getName()); + tableText.append(" size:").append(coll.size()); + tableText.append(" flags:").append(Integer.toHexString(flag));

+ for (Map.Entry<String,int[]> entry : meta.getIntegerParameters().entrySet()) + { + tableText.append( "\n ").append(entry.getKey()).append(":\t"); + for(int v : entry.getValue()) + { + tableText.append(v); + tableText.append(", "); + } + if (entry.getValue().length > 0) tableText.setLength(tableText.length()-2); + } + for (Map.Entry<String,float[]> entry : meta.getFloatParameters().entrySet()) + { + tableText.append( "\n ").append(entry.getKey()).append(":\t"); + for(float v : entry.getValue()) + { + tableText.append(v); + tableText.append(", "); + } + if (entry.getValue().length > 0) tableText.setLength(tableText.length()-2); + } + for (Map.Entry<String,String[]> entry : meta.getStringParameters().entrySet()) + { + tableText.append( "\n ").append(entry.getKey()).append(":\t"); + for(String v : entry.getValue()) + { + tableText.append(v); + tableText.append(", "); + } + if (entry.getValue().length > 0) tableText.setLength(tableText.length()-2); + } + m_tableLabel.setText(tableText.toString()) ;

- Template template = new Template(EventBrowserTableModel.class); - Result result = m_app.getLookup().lookup(template); - Collection<EventBrowserTableModel> models = (Collection<EventBrowserTableModel>) result.allInstances(); - - boolean ok = false; - for (EventBrowserTableModel model : models) - { - if (model.canDisplay(type)) - { - model.setData(meta,coll); - m_table.setModel(model); - ok = true; - break; - } - } - if (!ok) - { - m_table.setModel(emptyTable); - - } - cardLayout.first(panel);

+ Template template = new Template(EventBrowserTableModel.class); + Result result = m_app.getLookup().lookup(template); + Collection<EventBrowserTableModel> models = (Collection<EventBrowserTableModel>) result.allInstances(); + + boolean ok = false; + for (EventBrowserTableModel model : models) + { + if (model.canDisplay(type)) + { + model.setData(meta,coll); + m_table.setModel(model); + ok = true; + break; + } + } + if (!ok) + { + m_table.setModel(emptyTable); + + } + cardLayout.first(panel);

lcsim/src/org/lcsim/util/event

BaseLCSimEvent.java 1.12 -> 1.13

diff -u -r1.12 -r1.13
--- BaseLCSimEvent.java	19 Jul 2005 23:51:52 -0000	1.12
+++ BaseLCSimEvent.java	26 Jul 2005 14:44:34 -0000	1.13
@@ -10,6 +10,7 @@

 import org.lcsim.conditions.ConditionsManager.ConditionsNotFoundException;
 import org.lcsim.event.Cluster;
 import org.lcsim.event.EventHeader;

+import org.lcsim.event.EventHeader.LCMetaData;

 import org.lcsim.event.MCParticle;
 import org.lcsim.event.SimCalorimeterHit;
 import org.lcsim.event.SimTrackerHit;

@@ -23,10 +24,11 @@

 public class BaseLCSimEvent extends BaseEvent implements EventHeader
 {
    private String detectorName;

-   private Map<List,LCMetaData> metaDataMap = new HashMap<List,LCMetaData>();

+   private Map<ListHolder,LCMetaData> metaDataMap = new HashMap<ListHolder,LCMetaData>();

    private Detector detector;
    private ConditionsManager conditionsManager;
    private static final int ns = 1000000;

+   private static final String READOUT_NAME = "ReadoutName";

    
    /** Creates a new instance of BaseLCSimEvent */
    public BaseLCSimEvent(int run, int event, String detectorName)

@@ -61,7 +63,7 @@

    {
       return get(MCParticle.class,MC_PARTICLES);
    }

    public List<Track> getTracks()
    {
       return get(Track.class,TRACKS);

@@ -71,40 +73,40 @@

    {
       return get(Cluster.class,CLUSTERS);
    }

    public List<SimCalorimeterHit> getSimCalorimeterHits(String name)
    {
       return get(SimCalorimeterHit.class,name);
    }

    public List<SimTrackerHit> getSimTrackerHits(String name)
    {
       return get(SimTrackerHit.class,name);
    }

    public <T> List<T> get(Class<T> type, String name)
    {
       return (List<T>) get(name);
    }

    public <T> List<List<T>> get(Class<T> type)
    {
       List<List<T>> result = new ArrayList<List<T>>();

-      for (Map.Entry<List,LCMetaData> entry : metaDataMap.entrySet())

+      for (Map.Entry<ListHolder,LCMetaData> entry : metaDataMap.entrySet())

       {
          if (type.isAssignableFrom(entry.getValue().getType()))
          {

-            result.add(entry.getKey());

+            result.add(entry.getKey().getList());

          }
       }
       return result;
    }

    public LCMetaData getMetaData(List x)
    {

-      return metaDataMap.get(x);

+      return metaDataMap.get(new ListHolder(x));

    public void put(String name, Object component)
    {
       super.put(name, component);

@@ -113,34 +115,55 @@

          List list = (List) component;
          Class type = list.isEmpty() ? Object.class : list.get(0).getClass();
          for (Object o : list) if (!type.isAssignableFrom(o.getClass())) type = Object.class;

-         metaDataMap.put(list,new MetaData(name,type,0));

+         metaDataMap.put(new ListHolder(list),new MetaData(name,type,0,null));

       }
    }

-   
-   public void put(String name, List component, Class type, int flags)

+   public void put(String name, List collection, Class type, int flags)

-      super.put(name,component);
-      metaDataMap.put(component,new MetaData(name,type,flags));

+      put(name,collection,type,flags,null);

+   public void put(String name, List collection, Class type, int flags, String readoutName)
+   {
+      super.put(name,collection);
+      metaDataMap.put(new ListHolder(collection),new MetaData(name,type,flags,readoutName));
+   }
+   protected void put(String name, List collection, Class type, int flags, Map intMap, Map floatMap, Map stringMap)
+   {
+      super.put(name,collection);
+      metaDataMap.put(new ListHolder(collection),new MetaData(name, type, flags, intMap, floatMap, stringMap));
+   }
+

    public String getDetectorName()
    {
       return detectorName;
    }

    private class MetaData implements LCMetaData
    {
       private int flags;
       private String name;
       private Class type;

+      private Map<String, int[]> intMap;
+      private Map<String, float[]> floatMap;
+      private Map<String, String[]> stringMap;

-      MetaData(String name, Class type, int flags)

+      MetaData(String name, Class type, int flags, String readoutName)

       {
          this.name = name;
          this.type = type;
          this.flags = flags;

+         if (readoutName != null) getStringParameters().put(READOUT_NAME,new String[]{ readoutName });

+      MetaData(String name, Class type, int flags, Map intMap, Map floatMap, Map stringMap)
+      {
+         this.name = name;
+         this.type = type;
+         this.flags = flags;
+         this.intMap = intMap;
+         this.floatMap = floatMap;
+         this.stringMap = stringMap;
+      }
+

       public int getFlags()
       {
          return flags;

@@ -155,10 +178,66 @@

       {
          return type;
       }

       public org.lcsim.geometry.IDDecoder getIDDecoder()
       {

-         return getDetector().getDecoder(name);

+         // If the IDDecoder name is explicitly set then use it, otherwise 
+         // use the name of the collection itself.
+         String readoutName = name;
+         if (stringMap != null)
+         {
+            String[] names = stringMap.get(READOUT_NAME);
+            if (names != null && names.length >= 1) readoutName = names[0];
+         }
+         org.lcsim.geometry.IDDecoder result = getDetector().getDecoder(readoutName);
+         if (result == null) throw new RuntimeException("Could not find decoder for collection: "+name+" readout: "+readoutName);
+         return result;
+      }
+      
+      public Map<String, int[]> getIntegerParameters()
+      {
+         if (intMap == null) intMap = new HashMap<String, int[]>();
+         return intMap;
+      }
+      
+      public Map<String, float[]> getFloatParameters()
+      {
+         if (floatMap == null) floatMap = new HashMap<String, float[]>();
+         return floatMap;
+      }
+      
+      public Map<String, String[]> getStringParameters()
+      {
+         if (stringMap == null) stringMap = new HashMap<String, String[]>();
+         return stringMap;
+      }
+   }
+   // All empty lists are considered equal, but we need to put several different possibly empty lists 
+   // into the metadata map. ListHolder is a workaround for this.
+   private class ListHolder 
+   {
+      private List list;
+      ListHolder(List list)
+      {
+         this.list = list;
+      }
+      List getList()
+      {
+         return list;
+      }
+      public boolean equals(Object obj)
+      {
+         if (obj instanceof ListHolder)
+         {
+            ListHolder that= (ListHolder) obj;
+            return this.list == that.list;
+         }
+         return false;
+      }
+
+      public int hashCode()
+      {
+         return list.hashCode();

       }
    }
 }

\ No newline at end of file

+ Map<String,int[]> intMap = md.getIntegerParameters(); + Map<String,float[]> floatMap = md.getFloatParameters(); + Map<String,String[]> stringMap = md.getStringParameters(); + SIOLCParameters colParameters = null; + SIOLCParameters.write(intMap,floatMap,stringMap,out);

+ SIOLCParameters parameters = collection.getParameters(); + super.put(name,collection,collection.getType(),collection.getFlags(),parameters.getIntMap(), parameters.getFloatMap(), parameters.getStringMap());

+ private Map<String,int[]> _intMap = new HashMap<String,int[]>(); + private Map<String,float[]> _floatMap = new HashMap<String,float[]>(); + private Map<String,String[]> _stringMap = new HashMap<String,String[]>(); + + + Map<String,int[]> getIntMap() + { + return _intMap; + } + Map<String,float[]> getFloatMap() + { + return _floatMap; + } + Map<String,String[]> getStringMap() + { + return _stringMap; + }

+ static void write(Map<String,int[]> intMap, Map<String,float[]> floatMap, Map<String,String[]> stringMap, SIOOutputStream out) throws IOException + { + out.writeInt(intMap.size()); + for (Map.Entry<String,int[]> entry : intMap.entrySet()) + { + out.writeString(entry.getKey()); + int[] values = entry.getValue(); + out.writeInt(values.length) ; + for (int v : values) + { + out.writeInt(v); + } + } + out.writeInt(floatMap.size()); + for (Map.Entry<String,float[]> entry : floatMap.entrySet()) + { + out.writeString(entry.getKey()); + float[] values = entry.getValue(); + out.writeInt(values.length) ; + for (float v : values) + { + out.writeFloat(v); + } + } + out.writeInt(stringMap.size()); + for (Map.Entry<String,String[]> entry : stringMap.entrySet()) + { + out.writeString(entry.getKey()); + String[] values = entry.getValue(); + out.writeInt(values.length) ; + for (String v : values) + { + out.writeString(v); + } + } + }

Commit in `lcsim/src/org/lcsim` on MAIN
`event/EventHeader.java`	+17		1.8 -> 1.9
`plugin/browser/CollectionTable.java`	+61	-29	1.3 -> 1.4
`/LCSimEventBrowser.java`	+4	-2	1.6 -> 1.7
`util/event/BaseLCSimEvent.java`	+101	-22	1.12 -> 1.13
`util/lcio/AbstractBlockHandler.java`	+8	-6	1.3 -> 1.4
`/HandlerManager.java`	+4	-2	1.5 -> 1.6
`/LCIOCollection.java`	+9	-1	1.2 -> 1.3
`/LCIOConstants.java`	+2	-8	1.4 -> 1.5
`/LCIOEvent.java`	+2	-1	1.3 -> 1.4
`/SIOLCParameters.java`	+56	-4	1.1 -> 1.2
`/SIOSimCalorimeterHitBlockHandler.java`	+1	-1	1.2 -> 1.3
`/SIOSimTrackerHitBlockHandler.java`	+1	-1	1.2 -> 1.3
	+266	-77