Merge lp:~christopher-hunt08/maus/maus_scifi_updates into lp:maus/merge

[Christopher Hunt]

Straight track alignment fix.

[lp:~christopher-hunt08/maus/maus_scifi_updates]

1069. By Christopher Hunt on 2016-06-20

Fixed Style tests

=== modified file 'bin/user/scifi/tracker_resolution_plots.py'
--- bin/user/scifi/tracker_resolution_plots.py	2016-05-24 16:01:44 +0000
+++ bin/user/scifi/tracker_resolution_plots.py	2016-06-20 10:16:19 +0000
@@ -179,7 +179,7 @@
 
 
     tracker_dict['residual_xy'] = ROOT.TH2F( tracker+'_residual_xy', \
-             'Residual Position', 500, -50.0, 50.0, 500, -50.0, 50.0 )
+             'Residual Position', 800, -20.0, 20.0, 800, -20.0, 20.0 )
 
     tracker_dict['residual_mxmy'] = ROOT.TH2F( tracker+'_residual_mxmy', \
              'Residual Gradient', 500, -0.5, 0.5, 500, -0.5, 0.5 )
@@ -252,13 +252,13 @@
 
     tracker_dict['x_residual_p'] = ROOT.TH2F( \
                tracker+'_x_residual_p', "X Residuals in p", \
-                                     PZ_BIN, PZ_MIN, PZ_MAX, 500, -50.0, 50.0 )
+                                     PZ_BIN, PZ_MIN, PZ_MAX, 500, -20.0, 20.0 )
     tracker_dict['y_residual_p'] = ROOT.TH2F( \
                tracker+'_y_residual_p', "Y Residuals in p", \
-                                     PZ_BIN, PZ_MIN, PZ_MAX, 500, -50.0, 50.0 )
+                                     PZ_BIN, PZ_MIN, PZ_MAX, 500, -20.0, 20.0 )
     tracker_dict['r_residual_p'] = ROOT.TH2F( \
                tracker+'_r_residual_p', "Radius Residuals in p", \
-                                     PZ_BIN, PZ_MIN, PZ_MAX, 500, -50.0, 50.0 )
+                                       PZ_BIN, PZ_MIN, PZ_MAX, 500, 0.0, 50.0 )
 
     tracker_dict['px_residual_p'] = ROOT.TH2F( \
               tracker+'_px_residual_p', "p_{x} Residuals in p", \
@@ -281,13 +281,13 @@
 
     tracker_dict['x_residual_pt'] = ROOT.TH2F( \
                tracker+'_x_residual_pt', "X Residuals in p_{t}", \
-                                     PT_BIN, PT_MIN, PT_MAX, 500, -50.0, 50.0 )
+                                     PT_BIN, PT_MIN, PT_MAX, 500, -20.0, 20.0 )
     tracker_dict['y_residual_pt'] = ROOT.TH2F( \
                tracker+'_y_residual_pt', "Y Residuals in p_{t}", \
-                                     PT_BIN, PT_MIN, PT_MAX, 500, -50.0, 50.0 )
+                                     PT_BIN, PT_MIN, PT_MAX, 500, -20.0, 20.0 )
     tracker_dict['r_residual_pt'] = ROOT.TH2F( \
                tracker+'_r_residual_pt', "Radius Residuals in p_{t}", \
-                                     PT_BIN, PT_MIN, PT_MAX, 500, -50.0, 50.0 )
+                                       PT_BIN, PT_MIN, PT_MAX, 500, 0.0, 50.0 )
 
     tracker_dict['px_residual_pt'] = ROOT.TH2F( \
               tracker+'_px_residual_pt', "p_{x} Residuals in p_{t}", \
@@ -310,13 +310,13 @@
 
     tracker_dict['x_residual_pz'] = ROOT.TH2F( \
                tracker+'_x_residual_pz', "X Residuals in p_{z}", \
-                                     PZ_BIN, PZ_MIN, PZ_MAX, 500, -50.0, 50.0 )
+                                     PZ_BIN, PZ_MIN, PZ_MAX, 500, -20.0, 20.0 )
     tracker_dict['y_residual_pz'] = ROOT.TH2F( \
                tracker+'_y_residual_pz', "Y Residuals in p_{z}", \
-                                     PZ_BIN, PZ_MIN, PZ_MAX, 500, -50.0, 50.0 )
+                                     PZ_BIN, PZ_MIN, PZ_MAX, 500, -20.0, 20.0 )
     tracker_dict['r_residual_pz'] = ROOT.TH2F( \
                tracker+'_r_residual_pz', "Radius Residuals in p_{z}", \
-                                     PZ_BIN, PZ_MIN, PZ_MAX, 500, -50.0, 50.0 )
+                                       PZ_BIN, PZ_MIN, PZ_MAX, 500, 0.0, 50.0 )
 
     tracker_dict['mx_residual_pz'] = ROOT.TH2F( \
                tracker+'_mx_residual_pz', "m_{x} Residuals in p_{z}", \
 
=== modified file 'bin/utilities/data_tracker_verify.py'
--- bin/utilities/data_tracker_verify.py	2016-05-24 16:01:44 +0000
+++ bin/utilities/data_tracker_verify.py	2016-06-20 10:16:19 +0000
@@ -173,15 +173,26 @@
   reco_plots['channels_cluster'] = ROOT.TH1F( 'channels_cluster', \
                                         "Channels per Cluster", 50, 0.0, 50.0 )
   reco_plots['spacepoints_station'] = ROOT.TH1F( "spacepoints_station", \
-                           "Spacepoints Found in Each Station", 11, -5.0, 6.0 )
+                           "Spacepoints Found in Each Station", 11, -5.5, 5.5 )
   reco_plots['2_hit_spacepoints_station'] = ROOT.TH1F( \
                                                  "2_hit_spacepoints_station", \
-                           "Spacepoints Found in Each Station", 11, -5.0, 6.0 )
+                           "Spacepoints Found in Each Station", 11, -5.5, 5.5 )
   reco_plots['3_hit_spacepoints_station'] = ROOT.TH1F( \
                                                  "3_hit_spacepoints_station", \
-                           "Spacepoints Found in Each Station", 11, -5.0, 6.0 )
+                           "Spacepoints Found in Each Station", 11, -5.5, 5.5 )
   reco_plots['clusters_plane'] = ROOT.TH1F( "clusters_plane", \
-                              "Clusters Found in Each Plane", 31, -15.0, 16.0 )
+                              "Clusters Found in Each Plane", 31, -15.5, 15.5 )
+  reco_plots['spacepoints_station_used'] = ROOT.TH1F( \
+                                                  "spacepoints_station_used", \
+                           "Spacepoints Found in Each Station", 11, -5.5, 5.5 )
+  reco_plots['2_hit_spacepoints_station_used'] = ROOT.TH1F( \
+                                            "2_hit_spacepoints_station_used", \
+                           "Spacepoints Found in Each Station", 11, -5.5, 5.5 )
+  reco_plots['3_hit_spacepoints_station_used'] = ROOT.TH1F( \
+                                            "3_hit_spacepoints_station_used", \
+                           "Spacepoints Found in Each Station", 11, -5.5, 5.5 )
+  reco_plots['clusters_plane_used'] = ROOT.TH1F( "clusters_plane_used", \
+                              "Clusters Found in Each Plane", 31, -15.5, 15.5 )
   reco_plots['spacepoints'] = ROOT.TH2F( 'spacepoints', \
                "Spacepoint Positions", 200, -200.0, 200.0, 200, -200.0, 200.0 )
   reco_plots['saturations_event'] = ROOT.TH1F( 'saturations_event', \
@@ -268,6 +279,9 @@
                                        200, -200.0, 200.0, 200, -200.0, 200.0 )
       station_plots[dir_name]['kuno_plot'] = ROOT.TH1F( dir_name+'_kuno', \
                                   "Kuno Plot: "+dir_name, 1001, -0.25, 500.25 )
+      station_plots[dir_name]['kuno_plot_used'] = ROOT.TH1F( \
+                                                       dir_name+'_kuno_used', \
+                                  "Kuno Plot: "+dir_name, 1001, -0.25, 500.25 )
 
 
   plane_plots = {}
@@ -290,6 +304,8 @@
 
         plane_plots[dir_name]['channels_cluster'] = ROOT.TH1F( \
           dir_name+'_channels_cluster', "Channels per Cluster", 50, 0.0, 50.0 )
+        plane_plots[dir_name]['channels_cluster_used'] = ROOT.TH1F( \
+     dir_name+'_channels_cluster_used', "Channels per Cluster", 50, 0.0, 50.0 )
         plane_plots[dir_name]['npe_cluster'] = ROOT.TH1F( \
                     dir_name+'_npe_cluster', "NPE per Cluster", 75, 0.0, 75.0 )
 
@@ -386,6 +402,7 @@
     Examine a SciFi Event to see if it should be vetoed
   """
   digits = event.digits()
+  tracks = event.scifitracks()
   saturation_counter = 0
 
   for digit in digits :
@@ -394,8 +411,33 @@
 
   if saturation_counter > 1000 :
     return True
-  else :
-    return False
+
+  upstream_tracks = 0
+  downstream_tracks = 0
+  for track in tracks :
+    if track.P_value() < P_VALUE_CUT : 
+      return True
+
+    if track.tracker() == 0 :
+      upstream_tracks += 1
+    else :
+      downstream_tracks += 1
+
+    trackpoints = track.scifitrackpoints()
+    count_trackpoints = 0
+    for tp in trackpoints :
+      if tp.has_data() :
+        count_trackpoints += 1
+      elif tools.calculate_plane_id( tp.tracker(), tp.station(), tp.plane()) \
+                                                             in IGNORE_PLANES :
+        count_trackpoints += 1
+    if count_trackpoints < MIN_NUM_TRACKPOINTS :
+      return True
+
+  if (upstream_tracks != 1) or (downstream_tracks != 1) :
+    return True
+
+  return False
 
 
 def fill_plots_data(plot_dict, data_dict, event) :
@@ -468,11 +510,15 @@
   plot_dict['recon_plots']['saturations_event'].Fill( saturation_counter )
 
   kuno_sums = {}
+  kuno_sums_used = {}
   for tracker in [ 0, 1 ] :
     kuno_sums_stations = {}
+    kuno_sums_stations_used = {}
     for station in [ 1, 2, 3, 4, 5 ] :
       kuno_sums_stations[ station ] = 0.0
+      kuno_sums_stations_used[ station ] = 0.0
     kuno_sums[tracker] = kuno_sums_stations
+    kuno_sums_used[tracker] = kuno_sums_stations_used
 
   for cluster in clusters :
     tracker = cluster.get_tracker()
@@ -488,6 +534,10 @@
                                               ( -1.0 if tracker == 0 else 1.0 )
     clus_digits = cluster.get_digits_pointers()
     reco_plots['clusters_plane'].Fill(plane_id)
+    if cluster.is_used() :
+      kuno_sums_used[tracker][station] += cluster.get_channel()
+      reco_plots['clusters_plane_used'].Fill(plane_id)
+      plane_plots[dir_name]['channels_cluster_used'].Fill( len(clus_digits) )
     reco_plots['channels_cluster'].Fill( len(clus_digits) )
     plane_plots[dir_name]['channels_cluster'].Fill( len(clus_digits) )
 
@@ -513,6 +563,8 @@
     for station in [ 1, 2, 3, 4, 5 ] :
       dir_name = str(tracker)+'.'+str(station)
       station_plots[dir_name]['kuno_plot'].Fill( kuno_sums[tracker][station] )
+      station_plots[dir_name]['kuno_plot_used'].Fill( \
+                                             kuno_sums_used[tracker][station] )
 
   for spacepoint in spacepoints :
     tracker = spacepoint.get_tracker()
@@ -520,6 +572,8 @@
 
     station_id = station * ( -1.0 if tracker == 0 else 1.0 )
     reco_plots['spacepoints_station'].Fill(station_id)
+    if spacepoint.is_used() :
+      reco_plots['spacepoints_station_used'].Fill(station_id)
     reco_plots['spacepoints'].Fill( spacepoint.get_position().x(), \
                                                 spacepoint.get_position().y() )
 
@@ -541,6 +595,13 @@
       raise ValueError( "Unknown Number of spacepoints: " + \
                                str( sp_clusters ) )
 
+    if spacepoint.is_used() :
+      if len( sp_clusters ) == 2 :
+        reco_plots['2_hit_spacepoints_station_used'].Fill( station_id )
+      elif len( sp_clusters ) == 3 :
+        reco_plots['3_hit_spacepoints_station_used'].Fill( station_id )
+
+
     npe = 0.0
     for cluster in sp_clusters :
       clus_digits = cluster.get_digits_pointers()
@@ -967,11 +1028,11 @@
 ##### 3. Fill plots ###########################################################
           if namespace.cut_tof and cut_tof_event( plot_dict, tof_event ) :
             continue
-          if namespace.cut_scifi and \
+          elif namespace.cut_scifi and \
                                     cut_scifi_event( plot_dict, scifi_event ) :
             continue
-
-          fill_plots_data(plot_dict, data_dict, scifi_event)
+          else :
+            fill_plots_data(plot_dict, data_dict, scifi_event)
 
         except ValueError as ex :
           print "An Error Occured: " + str( ex )
 
=== modified file 'src/common_cpp/Recon/SciFi/SciFiGeometryHelper.cc'
--- src/common_cpp/Recon/SciFi/SciFiGeometryHelper.cc	2016-06-10 11:57:21 +0000
+++ src/common_cpp/Recon/SciFi/SciFiGeometryHelper.cc	2016-06-20 10:16:19 +0000
@@ -135,7 +135,11 @@
 
       SciFiTrackerGeometry trackerGeo = _geometry_map[tracker_n];
       trackerGeo.Position = referencePos;
-      trackerGeo.Rotation = trackerModule->globalRotation();
+      if (UseActiveRotations == true) {
+        trackerGeo.Rotation = trackerModule->globalRotation();
+      } else {
+        trackerGeo.Rotation = trackerModule->globalRotation().inverse();
+      }
       FieldValue(trackerModule, trackerGeo);
       trackerGeo.Planes[plane_id] = this_plane;
 
 
=== modified file 'src/common_py/analysis/inspectors.py'
--- src/common_py/analysis/inspectors.py	2016-05-06 17:17:13 +0000
+++ src/common_py/analysis/inspectors.py	2016-06-20 10:16:19 +0000
@@ -106,7 +106,9 @@
   def add_hit(self, hit) :
     if self.momentum_bias is not None :
       p = hit.get_p()
-      correction = 1.0 + (self.momentum_bias + self.momentum_correlation*p) / p
+#      correction = 1.0 + (self.momentum_bias + self.momentum_correlation*p) / p
+      correction = ((p - self.momentum_bias) / \
+                                         (1.0 - self.momentum_correlation)) / p
       hit.set_px(hit.get_px()*correction)
       hit.set_py(hit.get_py()*correction)
       hit.set_pz(hit.get_pz()*correction)
 
=== modified file 'src/common_py/analysis/tools.py'
--- src/common_py/analysis/tools.py	2016-05-11 13:10:28 +0000
+++ src/common_py/analysis/tools.py	2016-06-20 10:16:19 +0000
@@ -102,23 +102,22 @@
     projection = hist.ProjectionY( \
                    name+'_pro_'+str(i), i, i )
     if projection.GetEntries() == 0 :
-      x_pos.append( 0.0 )
-      y_pos.append( 0.0 )
-      x_error.append( 0.0 )
-      y_error.append( 0.0 )
+      continue
 
     pro_mean, pro_mean_err, pro_std, pro_std_err = \
                                    fit_gaussian( projection, fit_min, fit_max )
 
     x_pos.append( hist.GetXaxis().GetBinCenter( i ) )
     y_pos.append( pro_mean )
-    x_error.append( hist.GetXaxis().GetBinWidth( i ) )
+    x_error.append( 0.5*hist.GetXaxis().GetBinWidth( i ) )
     y_error.append( pro_mean_err )
 
-  profile = ROOT.TGraphErrors( len( x_pos ), x_pos, y_pos, x_error, y_error )
-  profile.SetName( name+'_profile' )
-
-  return profile
+  if len( x_pos ) < 1 :
+    return None 
+  else :
+    profile = ROOT.TGraphErrors( len( x_pos ), x_pos, y_pos, x_error, y_error )
+    profile.SetName( name+'_profile' )
+    return profile
 
 
 def gaussian_profile_y(hist, fit_min=0, fit_max=0) :
@@ -137,10 +136,7 @@
     projection = hist.ProjectionX( \
                    name+'_pro_'+str(i), i, i )
     if projection.GetEntries() == 0 :
-      x_pos.append( 0.0 )
-      y_pos.append( 0.0 )
-      x_error.append( 0.0 )
-      y_error.append( 0.0 )
+      continue
 
     pro_mean, pro_mean_err, pro_std, pro_std_err = \
                                    fit_gaussian( projection, fit_min, fit_max )
@@ -148,12 +144,14 @@
     x_pos.append( pro_mean )
     y_pos.append( hist.GetYaxis().GetBinCenter( i ) )
     x_error.append( pro_mean_err )
-    y_error.append( hist.GetYaxis().GetBinWidth( i ) )
-
-  profile = ROOT.TGraphErrors( len( x_pos ), x_pos, y_pos, x_error, y_error )
-  profile.SetName( name+'_profile' )
-
-  return profile
+    y_error.append( 0.5*hist.GetYaxis().GetBinWidth( i ) )
+
+  if len( x_pos ) < 1 :
+    return None 
+  else :
+    profile = ROOT.TGraphErrors( len( x_pos ), x_pos, y_pos, x_error, y_error )
+    profile.SetName( name+'_profile' )
+    return profile
 
 
 def sort_arrays(array_lists, key_list=0, descending=True) :
 
=== modified file 'src/map/MapCppTrackerVirtualsDigitization/MapCppTrackerVirtualsDigitization.cc'
--- src/map/MapCppTrackerVirtualsDigitization/MapCppTrackerVirtualsDigitization.cc	2016-03-08 12:45:28 +0000
+++ src/map/MapCppTrackerVirtualsDigitization/MapCppTrackerVirtualsDigitization.cc	2016-06-20 10:16:19 +0000
@@ -443,12 +443,15 @@
 
     ThreeVector vec = geometry.Direction.Orthogonal().Unit();
     double alpha = position.Dot(vec);
-    int channelNumber = floor(0.5 + ((7.0 * geometry.CentralFibre) -
-                                                            (2.0 * alpha / geometry.Pitch)) / 7.0);
+    double channelNumber = 0.5 + ((7.0 * geometry.CentralFibre) -
+                                                             (2.0 * alpha / geometry.Pitch)) / 7.0;
+
+    channelNumber = floor(channelNumber*2.0) / 2.0; // Force half integer binning
 
     double new_alpha;
     if (_smear_value < 0.0) {
-      new_alpha = 3.5 * geometry.Pitch * static_cast<double>(geometry.CentralFibre - channelNumber);
+      new_alpha = 3.5 * geometry.Pitch *
+                                      (static_cast<double>(geometry.CentralFibre) - channelNumber);
     } else {
       double smear_amount = CLHEP::RandGauss::shoot(0.0, _smear_value);
       new_alpha = alpha + smear_amount;