lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection

diff -u -r1.1 -r1.2
--- DRResolutionDriver.java	10 Dec 2009 19:55:06 -0000	1.1
+++ DRResolutionDriver.java	14 Dec 2009 21:54:22 -0000	1.2
@@ -6,6 +6,7 @@

  * for single particles. 
  */
 package org.lcsim.contrib.HansWenzel.DualCorrection;

+

 import org.lcsim.contrib.HansWenzel.DualCorrection.DigiSim.CSClusdMJetDriver;
 import org.lcsim.util.Driver;
 

@@ -15,15 +16,47 @@

  */
 public class DRResolutionDriver extends Driver {
 

+    String AIDAFile = null;
+    String file_name = null;
+    CSClusdMJetDriver digi;
+    Resolution resol;
+

     public DRResolutionDriver() {
 

-        CSClusdMJetDriver digi = new CSClusdMJetDriver();

+        digi = new CSClusdMJetDriver();

         add(digi);

-        Resolution resol = new Resolution();
-        String aidafile = ("LCPhys_digis_pi-_all_resol.aida");
-        resol.setMyAIDAFilename(aidafile);
-        String asciifile = ("LCPhys_digis_pi-_all_resol.txt");
-        resol.setMyFilename(asciifile);

+        resol = new Resolution();

         add(resol);
     }

+   @Override
+    public void startOfData() {
+        System.out.println("DRCalibrationDriver:startOfData");
+        System.out.println(AIDAFile);
+        if (AIDAFile != null) {
+            resol.setMyAIDAFilename(AIDAFile);
+        } else {
+            System.err.println("DRCalibrationDriver: AIDAFile variable must be set");
+            System.exit(1); // exit if variable is not set
+        }
+        if (file_name != null) {
+            resol.setMyFilename(file_name);
+        } else {
+            System.err.println("DRCalibrationDriver:  file_name variable must be set");
+            System.exit(1); // exit if variable is not set
+        }
+        resol.startOfData();
+
+    }
+
+    public void setMyAIDAFilename(String AIDAFile) {
+        System.out.println("DRCalibrationDriver:setMyAIDAFilename");
+        this.AIDAFile = AIDAFile;
+        System.out.println(AIDAFile);
+    }
+
+    public void setMyFilename(String file_name) {
+        System.out.println("DRCalibrationDriver:setMyFilename");
+        this.file_name = file_name;
+        System.out.println(file_name);
+    }

 }