Print

Print


Commit in lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection on MAIN
DRCalibrationDriver.java+56-21.2 -> 1.3
DRResolutionDriver.java+50-11.2 -> 1.3
DualCorrection.java+11.10 -> 1.11
+107-3
3 modified files


lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection
DRCalibrationDriver.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- DRCalibrationDriver.java	14 Dec 2009 21:53:15 -0000	1.2
+++ DRCalibrationDriver.java	24 Dec 2009 14:43:25 -0000	1.3
@@ -11,7 +11,18 @@
 import org.lcsim.util.Driver;
 
 public class DRCalibrationDriver extends Driver {
-
+    //
+    // default detector configuration:
+    //
+
+    private String Detector = "ccal02";
+    private String Material = "BGO";
+    private Double Density = 7.13;
+    private Double rindex = 1.65;
+    private String CollectionName = "Digis";
+    private Double CerenkovThres = 0.02;
+    private Double IonizationThres = 0.02;
+    private String PhysicsList = "LCPhys";
     String AIDAFile = null;
     String file_name = null;
     DualCorrection dual;
@@ -40,8 +51,15 @@
             System.err.println("DRCalibrationDriver:  file_name variable must be set");
             System.exit(1); // exit if variable is not set
         }
+        dual.setMyPhysicsList(PhysicsList);
+        dual.setMyDetector(Detector);
+        dual.setMyMaterial(Material);
+        dual.setMyDensity(Density);
+        dual.setMyrindex(rindex);
+        dual.setMyCollectionName(CollectionName);
+        dual.setMyCerenkovThres(CerenkovThres);
+        dual.setMyIonizationThres(IonizationThres);
         dual.startOfData();
-
     }
 
     public void setMyAIDAFilename(String AIDAFile) {
@@ -55,4 +73,40 @@
         this.file_name = file_name;
         System.out.println(file_name);
     }
+
+    public void setMyPhysicsList(String list) {
+        System.out.println("setMyPhysicsList");
+        this.PhysicsList = list;
+        System.out.println(list);
+    }
+
+    public void setMyDetector(String Detector) {
+        this.Detector = Detector;
+    }
+
+    public void setMyMaterial(String Material) {
+        this.Material = Material;
+    }
+
+    public void setMyDensity(double Density) {
+        System.out.println("DRCalibrationDriver:setMyDensity");
+        this.Density = Density;
+        System.out.println(Density);
+    }
+
+    public void setMyrindex(double rindex) {
+        this.rindex = rindex;
+    }
+
+    public void setMyCollectionName(String CollectionName) {
+        this.CollectionName = CollectionName;
+    }
+
+    public void setMyCerenkovThres(double CerenkovThres) {
+        this.CerenkovThres = CerenkovThres;
+    }
+
+    public void setMyIonizationThres(double IonizationThres) {
+        this.IonizationThres = IonizationThres;
+    }
 }

lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection
DRResolutionDriver.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- DRResolutionDriver.java	14 Dec 2009 21:54:22 -0000	1.2
+++ DRResolutionDriver.java	24 Dec 2009 14:43:25 -0000	1.3
@@ -15,10 +15,23 @@
  * @author wenzel
  */
 public class DRResolutionDriver extends Driver {
-
+    //
+    // default detector configuration:
+    //
+
+    private String Detector = "ccal02";
+    private String Material = "BGO";
+    private Double Density = 7.13;
+    private Double rindex = 1.65;
+    private String CollectionName = "Digis";
+    private Double CerenkovThres = 0.02;
+    private Double IonizationThres = 0.02;
+    private String PhysicsList = "LCPhys";
     String AIDAFile = null;
     String file_name = null;
+    DualCorrection dual;
     CSClusdMJetDriver digi;
+
     Resolution resol;
 
     public DRResolutionDriver() {
@@ -59,4 +72,40 @@
         this.file_name = file_name;
         System.out.println(file_name);
     }
+
+    public void setMyPhysicsList(String list) {
+        System.out.println("setMyPhysicsList");
+        this.PhysicsList = list;
+        System.out.println(list);
+    }
+
+    public void setMyDetector(String Detector) {
+        this.Detector = Detector;
+    }
+
+    public void setMyMaterial(String Material) {
+        this.Material = Material;
+    }
+
+    public void setMyDensity(double Density) {
+        System.out.println("DRCalibrationDriver:setMyDensity");
+        this.Density = Density;
+        System.out.println(Density);
+    }
+
+    public void setMyrindex(double rindex) {
+        this.rindex = rindex;
+    }
+
+    public void setMyCollectionName(String CollectionName) {
+        this.CollectionName = CollectionName;
+    }
+
+    public void setMyCerenkovThres(double CerenkovThres) {
+        this.CerenkovThres = CerenkovThres;
+    }
+
+    public void setMyIonizationThres(double IonizationThres) {
+        this.IonizationThres = IonizationThres;
+    }
 }

lcsim-contrib/src/main/java/org/lcsim/contrib/HansWenzel/DualCorrection
DualCorrection.java 1.10 -> 1.11
diff -u -r1.10 -r1.11
--- DualCorrection.java	21 Dec 2009 22:45:04 -0000	1.10
+++ DualCorrection.java	24 Dec 2009 14:43:25 -0000	1.11
@@ -111,6 +111,7 @@
         poly.setParameter("p3", 0.5);
         poly.setParameter("p4", 0.0);
         DRFunctionFactory mapoff = DRFunctionFactory.getInstance();
+        System.out.println(Density);
         DetectorConfiguration dc = new DetectorConfiguration(Detector, Material,
                 Density, rindex,
                 CollectionName, CerenkovThres,
CVSspam 0.2.8