lcsim/src/org/lcsim/plugin

FileSelector.java 1.1 -> 1.2

diff -u -r1.1 -r1.2
--- FileSelector.java	15 Mar 2007 05:24:30 -0000	1.1
+++ FileSelector.java	15 Mar 2007 06:39:40 -0000	1.2
@@ -42,11 +42,11 @@

       this.defaultFileListTitle = fileType+" File List";
       model.addListDataListener(this);
       initComponents();

-      boolean multi = Boolean.valueOf(app.getUserProperties().getProperty("org.lcsim.FileSelector.Multi","false"));
-      jTabbedPane1.setSelectedIndex(multi ? 1 : 0);
-      String[] list = PropertyUtilities.getStringArray(app.getUserProperties(),"org.lcsim.FileSelector.FileList",null);

+      boolean multi = Boolean.valueOf(app.getUserProperties().getProperty("org.lcsim.FileSelector.Multi."+fileType,"false"));
+      singleMultiTabbedPane.setSelectedIndex(multi ? 1 : 0);
+      String[] list = PropertyUtilities.getStringArray(app.getUserProperties(),"org.lcsim.FileSelector.FileList."+fileType,null);

       if (list != null) for (int i=0; i<list.length; i++) model.addElement(new File(list[i]));

-      listNameTextField.setText(app.getUserProperties().getProperty("org.lcsim.FileSelector.FileList.title",defaultFileListTitle));

+      listNameTextField.setText(app.getUserProperties().getProperty("org.lcsim.FileSelector.FileList.title."+fileType,defaultFileListTitle));

    }
    
    /** This method is called from within the constructor to

@@ -58,8 +58,11 @@

    private void initComponents()
    {
       java.awt.GridBagConstraints gridBagConstraints;

+      javax.swing.JLabel jLabel1;
+      javax.swing.JLabel jLabel2;
+      javax.swing.JScrollPane jScrollPane1;

-      jTabbedPane1 = new javax.swing.JTabbedPane();

+      singleMultiTabbedPane = new javax.swing.JTabbedPane();

       singleFilePanel = new javax.swing.JPanel();
       jLabel1 = new javax.swing.JLabel();
       fileNameTextField = new javax.swing.JTextField();

@@ -78,7 +81,7 @@

 
       setLayout(new java.awt.BorderLayout());

-      jTabbedPane1.setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10));

+      singleMultiTabbedPane.setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10));

       singleFilePanel.setLayout(new java.awt.GridBagLayout());
 
       singleFilePanel.setBorder(javax.swing.BorderFactory.createEmptyBorder(10, 10, 10, 10));

@@ -101,7 +104,7 @@

 
       singleFilePanel.add(browseButton, new java.awt.GridBagConstraints());

-      jTabbedPane1.addTab("Single File", singleFilePanel);

+      singleMultiTabbedPane.addTab("Single File", singleFilePanel);

 
       multiFilePanel.setLayout(new java.awt.GridBagLayout());

@@ -138,6 +141,7 @@

       multiFilePanel.add(jScrollPane1, gridBagConstraints);
 
       upButton.setText("Move Up");

+      upButton.setEnabled(false);

       upButton.addActionListener(new java.awt.event.ActionListener()
       {
          public void actionPerformed(java.awt.event.ActionEvent evt)

@@ -155,6 +159,7 @@

       multiFilePanel.add(upButton, gridBagConstraints);
 
       downButton.setText("Move Down");

+      downButton.setEnabled(false);

       downButton.addActionListener(new java.awt.event.ActionListener()
       {
          public void actionPerformed(java.awt.event.ActionEvent evt)

@@ -185,6 +190,7 @@

       multiFilePanel.add(addButton, gridBagConstraints);
 
       removeButton.setText("Remove");

+      removeButton.setEnabled(false);

       removeButton.addActionListener(new java.awt.event.ActionListener()
       {
          public void actionPerformed(java.awt.event.ActionEvent evt)

@@ -200,6 +206,7 @@

       multiFilePanel.add(removeButton, gridBagConstraints);
 
       saveButton.setText("Save...");

+      saveButton.setEnabled(false);

       saveButton.addActionListener(new java.awt.event.ActionListener()
       {
          public void actionPerformed(java.awt.event.ActionEvent evt)

@@ -229,9 +236,9 @@

       gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTH;
       multiFilePanel.add(restoreButton, gridBagConstraints);

-      jTabbedPane1.addTab("Multiple Files", multiFilePanel);

+      singleMultiTabbedPane.addTab("Multiple Files", multiFilePanel);

-      add(jTabbedPane1, java.awt.BorderLayout.CENTER);

+      add(singleMultiTabbedPane, java.awt.BorderLayout.CENTER);

 
    }// </editor-fold>//GEN-END:initComponents

@@ -249,7 +256,7 @@

       app.getUserProperties().setProperty("org.lcsim.FileSelector.Browse."+fileType,file.getAbsolutePath());
       if (file.getPath().endsWith("."+fileExtension))
       {

-         jTabbedPane1.setSelectedIndex(1);

+         singleMultiTabbedPane.setSelectedIndex(1);

          readFileList(file);
       }
       else

@@ -396,7 +403,7 @@

    
    boolean isMultiFileSelected()
    {

-      return jTabbedPane1.getSelectedIndex() == 1;

+      return singleMultiTabbedPane.getSelectedIndex() == 1;

    }
    
    FileList getSelectedFiles()

@@ -412,11 +419,11 @@

    }
    public void onFinish()
    {

-      app.getUserProperties().setProperty("org.lcsim.FileSelector.Multi",String.valueOf(isMultiFileSelected()));

+      app.getUserProperties().setProperty("org.lcsim.FileSelector.Multi."+fileType,String.valueOf(isMultiFileSelected()));

       String[] list = new String[model.getSize()];
       for (int i=0; i<list.length; i++) list[i] = model.getElementAt(i).toString();

-      PropertyUtilities.setStringArray(app.getUserProperties(),"org.lcsim.FileSelector.FileList",list);
-      app.getUserProperties().setProperty("org.lcsim.FileSelector.FileList.title",listNameTextField.getText());

+      PropertyUtilities.setStringArray(app.getUserProperties(),"org.lcsim.FileSelector.FileList."+fileType,list);
+      app.getUserProperties().setProperty("org.lcsim.FileSelector.FileList.title."+fileType,listNameTextField.getText());

       dispose();
    }

@@ -427,16 +434,13 @@

    private javax.swing.JButton downButton;
    private javax.swing.JList fileList;
    private javax.swing.JTextField fileNameTextField;

-   private javax.swing.JLabel jLabel1;
-   private javax.swing.JLabel jLabel2;
-   private javax.swing.JScrollPane jScrollPane1;
-   private javax.swing.JTabbedPane jTabbedPane1;

    private javax.swing.JTextField listNameTextField;
    private javax.swing.JPanel multiFilePanel;
    private javax.swing.JButton removeButton;
    private javax.swing.JButton restoreButton;
    private javax.swing.JButton saveButton;
    private javax.swing.JPanel singleFilePanel;

+   private javax.swing.JTabbedPane singleMultiTabbedPane;

    private javax.swing.JButton upButton;
    // End of variables declaration//GEN-END:variables

lcsim/src/org/lcsim/util/loop

StdhepEventSource.java 1.5 -> 1.6

diff -u -r1.5 -r1.6
--- StdhepEventSource.java	4 Oct 2006 22:57:44 -0000	1.5
+++ StdhepEventSource.java	15 Mar 2007 06:39:40 -0000	1.6
@@ -7,6 +7,8 @@

 import java.io.EOFException;
 import java.io.File;
 import java.io.IOException;

+import java.util.Collections;
+import java.util.List;

 import org.freehep.record.source.EndOfSourceException;
 import org.freehep.record.source.NoSuchRecordException;
 import org.freehep.record.source.RandomAccessRecordSource;

@@ -17,22 +19,39 @@

 /**
  * Convert an LCIOReader to a SequentialRecordSource
  * @author tonyj

- * @version $Id: StdhepEventSource.java,v 1.5 2006/10/04 22:57:44 tonyj Exp $

+ * @version $Id: StdhepEventSource.java,v 1.6 2007/03/15 06:39:40 tonyj Exp $

  */
 public class StdhepEventSource implements RandomAccessRecordSource
 {

-   private final File file;

+   private List<File> files;
+   private String name;

    private boolean atEnd;
    private StdhepReader reader;
    private final StdhepConverter converter;
    private EventHeader currentEvent;
    private int currentEventNumber;

+   private int currentFile = 0;

+   /**
+    * Create an event source from a single stdhep file
+    */

    public StdhepEventSource(File file, String detectorName) throws IOException
    {
       reader = new StdhepReader(file.getAbsolutePath());
       converter = new StdhepConverter(ParticlePropertyManager.getParticlePropertyProvider(),new LCSimFactory(detectorName));

-      this.file = file;

+      this.files = Collections.singletonList(file);
+      this.name = file.getName();
+   }
+   /**
+    * Create an event source from a list of stdhep files
+    */
+   public StdhepEventSource(FileList list, String detectorName) throws IOException
+   {
+      this.name = list.getTitle();
+      this.files = list.getFileList();
+      if (files.size() == 0) throw new IOException("File list is empty");
+      reader = new StdhepReader(files.get(0).getAbsolutePath());
+      converter = new StdhepConverter(ParticlePropertyManager.getParticlePropertyProvider(),new LCSimFactory(detectorName));

    }
    
    public Object getCurrentRecord() throws NoSuchRecordException, IOException, EndOfSourceException

@@ -44,7 +63,7 @@

    
    public long getEstimatedSize()
    {

-      return reader.getNumberOfEvents();

+      return files.size() == 1 ? reader.getNumberOfEvents() : -1;

    }
    
    public Class getRecordClass()

@@ -54,27 +73,38 @@

    
    public String getSourceName()
    {

-      return file.getName();

+      return name;

    }
    
    public void next() throws IOException
    {

-      try

+      for (;;)

-         for (;;)

+         try

-            StdhepRecord record = reader.nextRecord();
-            if (record instanceof StdhepEvent)

+            for (;;)

-               currentEvent = (EventHeader) converter.convert((StdhepEvent) record);
-               currentEventNumber++;
-               break;

+               StdhepRecord record = reader.nextRecord();
+               if (record instanceof StdhepEvent)
+               {
+                  currentEvent = (EventHeader) converter.convert((StdhepEvent) record);
+                  currentEventNumber++;
+                  break;
+               }

             }
          }

-      }
-      catch (EOFException x)
-      {
-         atEnd = true;

+         catch (EOFException x)
+         {
+            currentFile++;
+            if (currentFile >= files.size()) atEnd = true;
+            else
+            {
+               reader.close();
+               reader = new StdhepReader(files.get(currentFile).getAbsolutePath());
+               continue;
+            }
+         }
+         return;

       }
    }
    public void releaseRecord(Object obj)

@@ -83,7 +113,16 @@

    }
    public void rewind() throws IOException
    {

-      reader.rewind();

+      if (currentFile == 0)
+      {
+         reader.rewind();
+      }
+      else
+      {
+         currentFile = 0;
+         reader.close();
+         reader = new StdhepReader(files.get(0).getAbsolutePath());
+      }

       atEnd = false;
       currentEventNumber = 0;
    }

@@ -101,45 +140,64 @@

       {
          close();
       }

-      catch (IOException x) {}

+      catch (IOException x)
+      {}

    public void goToRecord(int target) throws NoSuchRecordException
    {
       try
       {

-         if (target < currentEventNumber) rewind();
-         if (target == currentEventNumber) return;
-         
-         while (true)
-         {  
-            StdhepRecord record = reader.nextRecord();
-            if (record instanceof StdhepEvent)

+         for (;;)
+         {
+            try

-               currentEventNumber++;  
-               if (currentEventNumber == target)

+               if (target < currentEventNumber) rewind();
+               if (target == currentEventNumber) return;
+               
+               for (;;)

-                  currentEvent = (EventHeader) converter.convert((StdhepEvent) record);
-                  break;

+                  StdhepRecord record = reader.nextRecord();
+                  if (record instanceof StdhepEvent)
+                  {
+                     currentEventNumber++;
+                     if (currentEventNumber == target)
+                     {
+                        currentEvent = (EventHeader) converter.convert((StdhepEvent) record);
+                        break;
+                     }
+                  }
+               }
+
+            }
+            catch (EOFException x)
+            {
+               currentFile++;
+               if (currentFile >= files.size())
+               {
+                  atEnd = true;
+                  NoSuchRecordException xx = new NoSuchRecordException();
+                  xx.initCause(x);
+                  throw xx;
+               }
+               else
+               {
+                  reader.close();
+                  reader = new StdhepReader(files.get(currentFile).getAbsolutePath());
+                  continue;

                }
             }

+            return;

          }
       }

-      catch (EOFException x)
-      {
-         atEnd = true; 
-         NoSuchRecordException xx = new NoSuchRecordException();
-         xx.initCause(x);
-         throw xx;
-      }

       catch (IOException x)
       {
          NoSuchRecordException xx = new NoSuchRecordException();
          xx.initCause(x);

-         throw xx;

+         throw xx;

       }
    }

    public int currentIndex()
    {
       return currentEventNumber;

Commit in `lcsim/src/org/lcsim` on MAIN
`plugin/StdhepFileSelector.java`	+38		1.2 -> 1.3
`/StdhepFileListHandler.java`	+44		added 1.1
`/StdhepDataSource.java`	+30		added 1.1
`/StdhepFileHandler.java`	+3	-3	1.2 -> 1.3
`/LCSimPlugin.java`	+4	-3	1.9 -> 1.10
`/FileSelector.form`	+15	-1	1.1 -> 1.2
`/FileSelector.java`	+22	-18	1.1 -> 1.2
`util/loop/StdhepEventSource.java`	+97	-39	1.5 -> 1.6
	+253	-64