Print

Print


Commit in hps-java/src/main/java/org/lcsim/hps/users/phansson on MAIN
HelicalTrackHitResidualsDriver.java+27-131.2 -> 1.3
Removed catch of large residual and switched to hist from cloud

hps-java/src/main/java/org/lcsim/hps/users/phansson
HelicalTrackHitResidualsDriver.java 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- HelicalTrackHitResidualsDriver.java	18 Oct 2012 21:59:45 -0000	1.2
+++ HelicalTrackHitResidualsDriver.java	14 Nov 2012 00:51:25 -0000	1.3
@@ -45,10 +45,14 @@
     private TrackUtils _trackUtils = new TrackUtils();
     
     private AIDAFrame plotterFrame;
-    ICloud1D[] _h_resz_track_top = new ICloud1D[5];
-    ICloud1D[] _h_resz_track_bottom = new ICloud1D[5];
-    ICloud1D[] _h_resy_track_top = new ICloud1D[5];
-    ICloud1D[] _h_resy_track_bottom = new ICloud1D[5];
+//    ICloud1D[] _h_resz_track_top = new ICloud1D[5];
+//    ICloud1D[] _h_resz_track_bottom = new ICloud1D[5];
+//    ICloud1D[] _h_resy_track_top = new ICloud1D[5];
+//    ICloud1D[] _h_resy_track_bottom = new ICloud1D[5];
+    IHistogram1D[] _h_resz_track_top = new IHistogram1D[5];
+    IHistogram1D[] _h_resz_track_bottom = new IHistogram1D[5];
+    IHistogram1D[] _h_resy_track_top = new IHistogram1D[5];
+    IHistogram1D[] _h_resy_track_bottom = new IHistogram1D[5];
     IDataPointSet dps_hth_y_b;
     IDataPointSet dps_hth_y_t;
     IDataPointSet dps_hth_z_b;
@@ -123,7 +127,7 @@
                     isTop = true;
                 }
                 int layer = hth.Layer();
-                System.out.println(this.getClass().getSimpleName() + ": residual for hit at " + hth.toString() + " and layer " + layer);
+                if(_debug) System.out.println(this.getClass().getSimpleName() + ": residual for hit at " + hth.toString() + " and layer " + layer);
                 if(layer%2==0) {
                     System.out.println(this.getClass().getSimpleName() + ": HTH layer is not odd!" + layer);
                     System.exit(1);
@@ -137,10 +141,10 @@
                     this._h_resy_track_bottom[layer_idx].fill(res_track.get("resy"));
                 }
 
-                if(Math.abs(res_track.get("resy"))>0.02) {
-                    System.out.println(this.getClass().getSimpleName() + ": this has large y res = " + res_track.get("resy"));
-                    System.exit(1);
-                }
+//                if(Math.abs(res_track.get("resy"))>0.02) {
+//                    System.out.println(this.getClass().getSimpleName() + ": this has large y res = " + res_track.get("resy"));
+//                    System.exit(1);
+//                }
                 
             }
             
@@ -176,6 +180,12 @@
    
     private void makePlots() {
         
+        int nbins = 50;
+        double bins_resz_min = -0.2;
+        double bins_resz_max = 0.2;
+        double bins_resy_min = -0.4;
+        double bins_resy_max = 0.4;
+        
         _plotter_resz_top = aida.analysisFactory().createPlotterFactory().create();
         _plotter_resz_top.setTitle("res z top");
         _plotter_resz_top.createRegions(5,1);
@@ -183,8 +193,10 @@
         _plotter_resy_top.setTitle("res y top");
         _plotter_resy_top.createRegions(5,1);
         for(int i=1;i<6;++i) {
-            _h_resz_track_top[i-1] = aida.cloud1D("h_resz_track_top_layer"+i);
-            _h_resy_track_top[i-1] = aida.cloud1D("h_resy_track_top_layer"+i);
+//            _h_resz_track_top[i-1] = aida.cloud1D("h_resz_track_top_layer"+i);
+//            _h_resy_track_top[i-1] = aida.cloud1D("h_resy_track_top_layer"+i);
+            _h_resz_track_top[i-1] = aida.histogram1D("h_resz_track_top_layer"+i,nbins,bins_resz_min,bins_resz_max);
+            _h_resy_track_top[i-1] = aida.histogram1D("h_resy_track_top_layer"+i,nbins,bins_resy_min,bins_resy_max);
             _plotter_resz_top.region(i-1).plot(_h_resz_track_top[i-1]);
             _plotter_resy_top.region(i-1).plot(_h_resy_track_top[i-1]);
         }
@@ -196,8 +208,10 @@
         _plotter_resy_bottom.setTitle("res y bottom");
         _plotter_resy_bottom.createRegions(5,1);
         for(int i=1;i<6;++i) {
-            _h_resz_track_bottom[i-1] = aida.cloud1D("h_resz_track_bottom_layer"+i);
-            _h_resy_track_bottom[i-1] = aida.cloud1D("h_resy_track_bottom_layer"+i);
+            _h_resz_track_bottom[i-1] = aida.histogram1D("h_resz_track_bottom_layer"+i,nbins,bins_resz_min,bins_resz_max);
+            _h_resy_track_bottom[i-1] = aida.histogram1D("h_resy_track_bottom_layer"+i,nbins,bins_resy_min,bins_resy_max);
+//            _h_resz_track_bottom[i-1] = aida.cloud1D("h_resz_track_bottom_layer"+i);
+//            _h_resy_track_bottom[i-1] = aida.cloud1D("h_resy_track_bottom_layer"+i);
             _plotter_resz_bottom.region(i-1).plot(_h_resz_track_bottom[i-1]);
             _plotter_resy_bottom.region(i-1).plot(_h_resy_track_bottom[i-1]);
         
CVSspam 0.2.12


Use REPLY-ALL to reply to list

To unsubscribe from the LCD-CVS list, click the following link:
https://listserv.slac.stanford.edu/cgi-bin/wa?SUBED1=LCD-CVS&A=1