Print

Print


Commit in hps-java/src/main/java/org/lcsim/hps/users/phansson on MAIN
FastTrackResidualDriver.java+31-41.3 -> 1.4
Added single hit per layer event category.

hps-java/src/main/java/org/lcsim/hps/users/phansson
FastTrackResidualDriver.java 1.3 -> 1.4
diff -u -r1.3 -r1.4
--- FastTrackResidualDriver.java	8 May 2012 17:20:29 -0000	1.3
+++ FastTrackResidualDriver.java	8 May 2012 17:53:56 -0000	1.4
@@ -52,6 +52,7 @@
     private IAnalysisFactory af = aida.analysisFactory();
     private List< List<IHistogram1D> > resy_org = new ArrayList<List<IHistogram1D> >();
     private List< List<IHistogram1D> > resy_org_layallhit = new ArrayList<List<IHistogram1D> >();
+    private List< List<IHistogram1D> > resy_org_layallsinglehit = new ArrayList<List<IHistogram1D> >();
     private List< List<IHistogram1D> > resy_org_lay1hit = new ArrayList<List<IHistogram1D> >();
     private List< IHistogram1D > nhits_tracker = new ArrayList<IHistogram1D>();
     private List< List<IHistogram1D> > nhits_tracker_layer = new ArrayList<List<IHistogram1D> >();
@@ -61,6 +62,7 @@
     private List< IHistogram2D > ncl_ecal_map = new ArrayList<IHistogram2D>(); 
     private List< IHistogram2D > nselcl_ecal_map = new ArrayList<IHistogram2D>(); 
     private List< IHistogram2D> resy_2d_org_layallhit = new ArrayList<IHistogram2D>();
+    private List< IHistogram2D> resy_2d_org_layallsinglehit = new ArrayList<IHistogram2D>();
     
     
     public void startOfData() {
@@ -112,6 +114,7 @@
 
             
             resy_2d_org_layallhit.add(hf.createHistogram2D("FT_resy_2d_org_layallhit_" + side, 5, 0.5, 5.5, 60, res_axis[0], res_axis[1]));
+            resy_2d_org_layallsinglehit.add(hf.createHistogram2D("FT_resy_2d_org_layallsinglehit_" + side, 5, 0.5, 5.5, 60, res_axis[0], res_axis[1]));
             
                    
             List<IHistogram1D> list  = new ArrayList<IHistogram1D>();
@@ -119,7 +122,9 @@
             List<IHistogram1D> listLayAllHit  = new ArrayList<IHistogram1D>();
             resy_org_layallhit.add(listLayAllHit);
             List<IHistogram1D> listLay1Hit  = new ArrayList<IHistogram1D>();
-            resy_org_lay1hit.add(listLay1Hit);            
+            resy_org_lay1hit.add(listLay1Hit);  
+            List<IHistogram1D> listLayAllSingleHit  = new ArrayList<IHistogram1D>();
+            resy_org_layallsinglehit.add(listLayAllSingleHit);
 
                 
             //Setup the ecal 2D plot
@@ -143,6 +148,9 @@
                 IHistogram1D hLay1 = hf.createHistogram1D("FT_res_Lay1Hit_" + side + "_l"+iLayer, 50,res_axis[0], res_axis[1]);
                 listLay1Hit.add(hLay1);
                 
+                IHistogram1D hAllSingle = hf.createHistogram1D("FT_res_LayAllSingleHit_" + side + "_l"+iLayer, 50,res_axis[0], res_axis[1]);
+                listLayAllSingleHit.add(hAllSingle);
+                
             }
         }
         
@@ -291,7 +299,7 @@
             
         
             nhits = 0;
-            nhitsInTracker = getNLayersWithAxialHit(trackerHits,sides[iSide]);
+            nhitsInTracker = getNAxialHits(trackerHits,sides[iSide]);
             
             if( debug ) System.out.println("There are " + nhitsInTracker + " hits on this side of the tracker");
             
@@ -302,6 +310,12 @@
 
             int nhitsInLayers[] = getNAxialHitsPerLayer(trackerHits,sides[iSide]);
 
+            boolean allLayersHasHits = true;
+            boolean allLayersHasSingleHit = true;
+            for (int i=0;i<5;++i){
+                if(nhitsInLayers[i]==0) allLayersHasHits = false;
+                if(nhitsInLayers[i]!=1) allLayersHasSingleHit = false;
+            }
             
             if( debug ) {
                 System.out.println("Number of hits per layer:");
@@ -361,10 +375,16 @@
                 else layerIndex = (layer-1)/2;
                 resy_org.get(iSide).get(layerIndex).fill(res);
                 
-                if (nhitsInTracker==5) {
+               
+                
+                if (allLayersHasHits) {
                     resy_org_layallhit.get(iSide).get(layerIndex).fill(res);
                     resy_2d_org_layallhit.get(iSide).fill((double)layerIndex+1, res, 1);
                 }
+                if (allLayersHasSingleHit) {
+                    resy_org_layallsinglehit.get(iSide).get(layerIndex).fill(res);
+                    resy_2d_org_layallsinglehit.get(iSide).fill((double)layerIndex+1, res, 1);
+                }
                 
                 if (nhitsInLayers[0]>0) {
                     resy_org_lay1hit.get(iSide).get(layerIndex).fill(res);
@@ -543,7 +563,7 @@
         return axial;
     }
         
-    private int getNLayersWithAxialHit(List<SiTrackerHitStrip1D> trackerHits, String side) {
+    private int getNAxialHits(List<SiTrackerHitStrip1D> trackerHits, String side) {
         int nhits=0;
         for ( SiTrackerHitStrip1D stripCluster : trackerHits ) {
             
@@ -672,6 +692,8 @@
         plotter_org.createRegions(5,2,0);
         IPlotter plotter_org_LayAllHit = af.createPlotterFactory().create("HPS SVT Fast Track Residuals (All layers has hits)");
         plotter_org_LayAllHit.createRegions(6,2,0);
+        IPlotter plotter_org_LayAllSingleHit = af.createPlotterFactory().create("HPS SVT Fast Track Residuals (All layers has single hit)");
+        plotter_org_LayAllSingleHit.createRegions(6,2,0);
         IPlotter plotter_org_Lay1Hit = af.createPlotterFactory().create("HPS SVT Fast Track Residuals (1st layer has hits)");
         plotter_org_Lay1Hit.createRegions(5,2,0);
         
@@ -685,6 +707,7 @@
                 
                 plotter_org.region(idx).plot(resy_org.get(iSide).get(iLayer));
                 plotter_org_LayAllHit.region(idx).plot(resy_org_layallhit.get(iSide).get(iLayer));
+                plotter_org_LayAllSingleHit.region(idx).plot(resy_org_layallsinglehit.get(iSide).get(iLayer));
                 plotter_org_Lay1Hit.region(idx).plot(resy_org_lay1hit.get(iSide).get(iLayer));
 
 
@@ -695,9 +718,13 @@
             plotter_org_LayAllHit.region(10+iSide).style().setParameter("hist2DStyle", "colorMap");
             plotter_org_LayAllHit.region(10+iSide).style().setParameter("colorMapScheme", "rainbow");
             plotter_org_LayAllHit.region(10+iSide).plot(resy_2d_org_layallhit.get(iSide));
+            plotter_org_LayAllSingleHit.region(10+iSide).style().setParameter("hist2DStyle", "colorMap");
+            plotter_org_LayAllSingleHit.region(10+iSide).style().setParameter("colorMapScheme", "rainbow");
+            plotter_org_LayAllSingleHit.region(10+iSide).plot(resy_2d_org_layallsinglehit.get(iSide));
         }
         plotter_org.show();
         plotter_org_LayAllHit.show();
+        plotter_org_LayAllSingleHit.show();
         plotter_org_Lay1Hit.show();
         
         
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