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

diff -u -r1.6 -r1.7
--- DualCorrection.java	15 Dec 2009 22:33:19 -0000	1.6
+++ DualCorrection.java	15 Dec 2009 23:11:36 -0000	1.7
@@ -39,7 +39,6 @@

     private AIDA aida = AIDA.defaultInstance();
     String AIDAFile;
     String file_name;

-    String Physics_List;

     double Gun_radius;
     FileWriter fstream;
     BufferedWriter out;

@@ -80,6 +79,17 @@

     double xval[] = {10.};
     double binwidth = 0.04;
     int maxbin = (int) Math.rint(1.0 / binwidth);

+    //
+    // 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";

 
     @Override
     protected void startOfData() {

@@ -91,19 +101,16 @@

         functionFactory = aida.analysisFactory().createFunctionFactory(aida.tree());
         gauss = functionFactory.createFunctionByName("gauss", "G");
         DRFunctionFactory mapoff = DRFunctionFactory.getInstance();

-        DetectorConfiguration dc = new DetectorConfiguration("ccal02", "BGO", 7.13, 1.65, "Digis", 0.02, 0.02, "LCPhys");

+        DetectorConfiguration dc = new DetectorConfiguration(Detector, Material,
+                Density, rindex,
+                CollectionName, CerenkovThres,
+                IonizationThres, PhysicsList);

         if (mapoff.checkdc(dc)) {
             E_cor = mapoff.getccFunction(dc);
             C_cor = mapoff.getecFunction(dc);
         } else {
             System.exit(0);
         }

-        DetectorConfiguration dc2 = new DetectorConfiguration("ccal02", "BGO", 7.13, 1.65, "Digis", 0.03, 0.03, "LCPhys");
-        if (mapoff.checkdc(dc)) {
-            System.out.println("Configuration dc2 does not exist");
-        } else {
-            System.out.println("Configuration dc2 does not exist");
-        }

         aida.profile1D("ratio", 20, 0.4, 1.);
         dlength = aida.histogramFactory().createCloud1D("dlength", "decay length combined ", 500000, "autoConvert = false");
         prof_combined = aida.histogramFactory().createProfile1D("ratio", "ratio combined", 20, 0.4, 1.);

@@ -191,13 +198,13 @@

         double sumECeren = 0.0;
         aida.profile1D("ratio", 20, 0.4, 1.);
         for (List<SimCalorimeterHit> simCalorimeterHits : simCalorimeterHitCollections) {

-            String CollectionName = event.getMetaData(simCalorimeterHits).getName();
-            if (CollectionName.startsWith("Edep_") && CollectionName.endsWith("DigiHits")) {

+            String ColName = event.getMetaData(simCalorimeterHits).getName();
+            if (ColName.startsWith("Edep_") && ColName.endsWith("DigiHits")) {

                 for (SimCalorimeterHit calorimeterHit : simCalorimeterHits) {
                     sumEEdep = sumEEdep + calorimeterHit.getRawEnergy();
                 }
             } // end if Edep

-            if (CollectionName.startsWith("Ceren_") && CollectionName.endsWith("DigiHits")) {

+            if (ColName.startsWith("Ceren_") && ColName.endsWith("DigiHits")) {

                 for (SimCalorimeterHit calorimeterHit : simCalorimeterHits) {
                     sumECeren = sumECeren + calorimeterHit.getRawEnergy();
                 }

@@ -386,16 +393,37 @@

 
     public void setMyPhysicsList(String list) {
         System.out.println("setMyPhysicsList");

-        Physics_List = list;

+        this.PhysicsList = list;

         System.out.println(list);
     }
 

-    public void setMyradius(double radius) {
-        System.out.println("setMyPhysicsList");
-        Gun_radius = radius;
-        System.out.println(Gun_radius);

+    public void setMyDetector(String Detector) {
+        this.Detector = Detector;
+    }
+
+    public void setMyMaterial(String Material) {
+        this.Material = Material;
+    }
+
+    public void setMyDensity(Double Density) {
+        this.Density = 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;
+    }

     double roundTwoDecimals(double d) {
         DecimalFormat twoDForm = new DecimalFormat("#.##");
         return Double.valueOf(twoDForm.format(d));