Commit faca03d4 authored by Daniel Campora's avatar Daniel Campora
Browse files

Updated all properties to the new definition.

parent ecfb086a
Pipeline #1633381 passed with stage
in 51 seconds
......@@ -40,7 +40,7 @@ velo_calculate_phi_and_sort_t "velo_calculate_phi_and_sort_t" (
dev_sorted_velo_cluster_container_t = DeviceOutput("dev_sorted_velo_cluster_container_t", char),
dev_hit_permutation_t = DeviceOutput("dev_hit_permutation_t", uint32_t),
dev_hit_phi_t = DeviceOutput("dev_hit_phi_t", half_t),
block_dim = Property(DeviceDimensions, {64, 1, 1}, block dimensions) = "")
block_dim = PROPERTY(DeviceDimensions, 1, 1}, block dimensions, {64) = "")
```
You can also create an instance of the algorithm and auto-complete the parameters:
......@@ -54,7 +54,7 @@ a.dev_ut_hit_offsets_t( a.filename(
a.dev_ut_hits_t( a.host_number_of_reconstructed_velo_tracks_t( a.original_name(
a.dev_ut_number_of_selected_velo_tracks_t( a.host_number_of_selected_events_t( a.parameters(
>>> a.block_dim_y_t()
Property(uint32_t, 64, block dimension Y) = ""
PROPERTY(uint32_t, block dimension Y) = ""
```
......@@ -83,7 +83,7 @@ with either loose or restricted cuts. The full code can be found in `generator/U
compass_ut = None
if restricted:
ut_search_windows = ut_search_windows_t(
min_momentum="1500.0", min_pt="300.0")
min_momentum="1500.0", min_pt="300.0", 64)
compass_ut = compass_ut_t(
max_considered_before_found="6",
min_momentum_final="2500.0",
......
......@@ -135,8 +135,8 @@ namespace saxpy {
DEVICE_OUTPUT(dev_saxpy_output_t, float) dev_saxpy_output;
PROPERTY(saxpy_scale_factor_t, float, "saxpy_scale_factor", "scale factor a used in a*x + y") saxpy_scale_factor;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(saxpy_scale_factor_t, "saxpy_scale_factor", "scale factor a used in a*x + y", float) saxpy_scale_factor;
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
```
......
......@@ -20,7 +20,7 @@ namespace pv_beamline_calculate_denom {
DEVICE_OUTPUT(dev_pvtracks_denom_t, float) dev_pvtracks_denom;
DEVICE_INPUT(dev_zpeaks_t, float) dev_zpeaks;
DEVICE_INPUT(dev_number_of_zpeaks_t, uint) dev_number_of_zpeaks;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void pv_beamline_calculate_denom(Parameters);
......
......@@ -17,7 +17,7 @@ namespace pv_beamline_cleanup {
DEVICE_INPUT(dev_number_of_multi_fit_vertices_t, uint) dev_number_of_multi_fit_vertices;
DEVICE_OUTPUT(dev_multi_final_vertices_t, PV::Vertex) dev_multi_final_vertices;
DEVICE_OUTPUT(dev_number_of_multi_final_vertices_t, uint) dev_number_of_multi_final_vertices;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void pv_beamline_cleanup(Parameters);
......
......@@ -20,7 +20,7 @@ namespace pv_beamline_extrapolate {
DEVICE_INPUT(dev_offsets_velo_track_hit_number_t, uint) dev_velo_track_hit_number;
DEVICE_OUTPUT(dev_pvtracks_t, PVTrack) dev_pvtracks;
DEVICE_OUTPUT(dev_pvtrack_z_t, float) dev_pvtrack_z;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void pv_beamline_extrapolate(Parameters);
......
......@@ -18,7 +18,7 @@ namespace pv_beamline_histo {
DEVICE_INPUT(dev_offsets_velo_track_hit_number_t, uint) dev_velo_track_hit_number;
DEVICE_INPUT(dev_pvtracks_t, PVTrack) dev_pvtracks;
DEVICE_OUTPUT(dev_zhisto_t, float) dev_zhisto;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void pv_beamline_histo(Parameters, float* dev_beamline);
......
......@@ -23,7 +23,7 @@ namespace pv_beamline_multi_fitter {
DEVICE_OUTPUT(dev_multi_fit_vertices_t, PV::Vertex) dev_multi_fit_vertices;
DEVICE_OUTPUT(dev_number_of_multi_fit_vertices_t, uint) dev_number_of_multi_fit_vertices;
DEVICE_INPUT(dev_pvtrack_z_t, float) dev_pvtrack_z;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void pv_beamline_multi_fitter(
......
......@@ -27,7 +27,7 @@ namespace fit_seeds {
DEVICE_INPUT(dev_velo_kalman_beamline_states_t, char) dev_velo_kalman_beamline_states;
DEVICE_INPUT(dev_atomics_velo_t, uint) dev_atomics_velo;
DEVICE_INPUT(dev_velo_track_hit_number_t, uint) dev_velo_track_hit_number;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void fit_seeds(Parameters);
......
......@@ -17,18 +17,18 @@ namespace pv_get_seeds {
DEVICE_INPUT(dev_velo_track_hit_number_t, uint) dev_velo_track_hit_number;
DEVICE_OUTPUT(dev_seeds_t, PatPV::XYZPoint) dev_seeds;
DEVICE_OUTPUT(dev_number_seeds_t, uint) dev_number_seeds;
PROPERTY(max_chi2_merge_t, float, "max_chi2_merge", "max chi2 merge") max_chi2_merge;
PROPERTY(factor_to_increase_errors_t, float, "factor_to_increase_errors", "factor to increase errors")
PROPERTY(max_chi2_merge_t, "max_chi2_merge", "max chi2 merge", float) max_chi2_merge;
PROPERTY(factor_to_increase_errors_t, "factor_to_increase_errors", "factor to increase errors", float)
factor_to_increase_errors;
PROPERTY(min_cluster_mult_t, int, "min_cluster_mult", "min cluster mult") min_cluster_mult;
PROPERTY(min_close_tracks_in_cluster_t, int, "min_close_tracks_in_cluster", "min close tracks in cluster")
PROPERTY(min_cluster_mult_t, "min_cluster_mult", "min cluster mult", int) min_cluster_mult;
PROPERTY(min_close_tracks_in_cluster_t, "min_close_tracks_in_cluster", "min close tracks in cluster", int)
min_close_tracks_in_cluster;
PROPERTY(dz_close_tracks_in_cluster_t, float, "dz_close_tracks_in_cluster", "dz close tracks in cluster [mm]")
PROPERTY(dz_close_tracks_in_cluster_t, "dz_close_tracks_in_cluster", "dz close tracks in cluster [mm]", float)
dz_close_tracks_in_cluster;
PROPERTY(high_mult_t, int, "high_mult", "high mult") high_mult;
PROPERTY(ratio_sig2_high_mult_t, float, "ratio_sig2_high_mult", "ratio sig2 high mult") ratio_sig2_high_mult;
PROPERTY(ratio_sig2_low_mult_t, float, "ratio_sig2_low_mult", "ratio sig2 low mult") ratio_sig2_low_mult;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(high_mult_t, "high_mult", "high mult", int) high_mult;
PROPERTY(ratio_sig2_high_mult_t, "ratio_sig2_high_mult", "ratio sig2 high mult", float) ratio_sig2_high_mult;
PROPERTY(ratio_sig2_low_mult_t, "ratio_sig2_low_mult", "ratio sig2 low mult", float) ratio_sig2_low_mult;
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__device__ int
......
......@@ -25,7 +25,7 @@ namespace scifi_consolidate_tracks {
DEVICE_INPUT(dev_offsets_ut_track_hit_number_t, uint) dev_ut_track_hit_number;
DEVICE_INPUT(dev_scifi_tracks_t, SciFi::TrackHits) dev_scifi_tracks;
DEVICE_INPUT(dev_scifi_lf_parametrization_consolidate_t, float) dev_scifi_lf_parametrization_consolidate;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void scifi_consolidate_tracks(Parameters);
......
......@@ -15,7 +15,7 @@ namespace scifi_copy_track_hit_number {
DEVICE_INPUT(dev_scifi_tracks_t, SciFi::TrackHits) dev_scifi_tracks;
DEVICE_INPUT(dev_offsets_forward_tracks_t, uint) dev_atomics_scifi;
DEVICE_OUTPUT(dev_scifi_track_hit_number_t, uint) dev_scifi_track_hit_number;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void scifi_copy_track_hit_number(Parameters);
......
......@@ -31,16 +31,10 @@ namespace lf_create_tracks {
DEVICE_OUTPUT(dev_scifi_lf_parametrization_t, float) dev_scifi_lf_parametrization;
DEVICE_INPUT(dev_ut_states_t, MiniState) dev_ut_states;
PROPERTY(
triplet_keep_best_block_dim_t,
DeviceDimensions,
"triplet_keep_best_block_dim",
"block dimensions triplet keep best");
triplet_keep_best_block_dim_t, "triplet_keep_best_block_dim", "block dimensions triplet keep best", DeviceDimensions);
PROPERTY(
calculate_parametrization_block_dim_t,
DeviceDimensions,
"calculate_parametrization_block_dim",
"block dimensions calculate parametrization");
PROPERTY(extend_tracks_block_dim_t, DeviceDimensions, "extend_tracks_block_dim", "block dimensions extend tracks");
calculate_parametrization_block_dim_t, "calculate_parametrization_block_dim", "block dimensions calculate parametrization", DeviceDimensions);
PROPERTY(extend_tracks_block_dim_t, "extend_tracks_block_dim", "block dimensions extend tracks", DeviceDimensions);
};
__global__ void lf_triplet_keep_best(Parameters, const LookingForward::Constants* dev_looking_forward_constants);
......
......@@ -15,7 +15,7 @@ namespace lf_least_mean_square_fit {
DEVICE_OUTPUT(dev_scifi_tracks_t, SciFi::TrackHits) dev_scifi_tracks;
DEVICE_INPUT(dev_atomics_scifi_t, uint) dev_atomics_scifi;
DEVICE_OUTPUT(dev_scifi_lf_parametrization_x_filter_t, float) dev_scifi_lf_parametrization_x_filter;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void lf_least_mean_square_fit(Parameters, const LookingForward::Constants* dev_looking_forward_constants);
......
......@@ -29,7 +29,7 @@ namespace lf_quality_filter {
DEVICE_INPUT(dev_offsets_all_velo_tracks_t, uint) dev_atomics_velo;
DEVICE_INPUT(dev_offsets_velo_track_hit_number_t, uint) dev_velo_track_hit_number;
DEVICE_INPUT(dev_ut_track_velo_indices_t, uint) dev_ut_track_velo_indices;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void lf_quality_filter(
......
......@@ -18,7 +18,7 @@ namespace lf_quality_filter_length {
DEVICE_OUTPUT(dev_scifi_lf_length_filtered_atomics_t, uint) dev_scifi_lf_length_filtered_atomics;
DEVICE_INPUT(dev_scifi_lf_parametrization_t, float) dev_scifi_lf_parametrization;
DEVICE_OUTPUT(dev_scifi_lf_parametrization_length_filter_t, float) dev_scifi_lf_parametrization_length_filter;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void lf_quality_filter_length(Parameters);
......
......@@ -17,7 +17,7 @@ namespace lf_quality_filter_x {
DEVICE_OUTPUT(dev_scifi_lf_x_filtered_atomics_t, uint) dev_scifi_lf_x_filtered_atomics;
DEVICE_INPUT(dev_scifi_lf_parametrization_t, float) dev_scifi_lf_parametrization;
DEVICE_OUTPUT(dev_scifi_lf_parametrization_x_filter_t, float) dev_scifi_lf_parametrization_x_filter;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void lf_quality_filter_x(Parameters);
......
......@@ -27,7 +27,7 @@ namespace lf_search_initial_windows {
DEVICE_OUTPUT(dev_scifi_lf_initial_windows_t, int) dev_scifi_lf_initial_windows;
DEVICE_OUTPUT(dev_ut_states_t, MiniState) dev_ut_states;
DEVICE_OUTPUT(dev_scifi_lf_process_track_t, bool) dev_scifi_lf_process_track;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void lf_search_initial_windows(
......
......@@ -11,7 +11,7 @@ namespace scifi_calculate_cluster_count_v4 {
DEVICE_INPUT(dev_scifi_raw_input_t, char) dev_scifi_raw_input;
DEVICE_INPUT(dev_scifi_raw_input_offsets_t, uint) dev_scifi_raw_input_offsets;
DEVICE_OUTPUT(dev_scifi_hit_count_t, uint) dev_scifi_hit_count;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void scifi_calculate_cluster_count_v4(Parameters, const char* scifi_geometry);
......
......@@ -14,8 +14,8 @@ namespace scifi_raw_bank_decoder_v4 {
DEVICE_INPUT(dev_cluster_references_t, uint) dev_cluster_references;
DEVICE_OUTPUT(dev_scifi_hits_t, char) dev_scifi_hits;
DEVICE_INPUT(dev_event_list_t, uint) dev_event_list;
PROPERTY(raw_bank_decoder_block_dim_t, DeviceDimensions, "raw_bank_decoder_block_dim", "block dimensions of raw bank decoder kernel");
PROPERTY(direct_decoder_block_dim_t, DeviceDimensions, "direct_decoder_block_dim", "block dimensions of direct decoder");
PROPERTY(raw_bank_decoder_block_dim_t, "raw_bank_decoder_block_dim", "block dimensions of raw bank decoder kernel", DeviceDimensions);
PROPERTY(direct_decoder_block_dim_t, "direct_decoder_block_dim", "block dimensions of direct decoder", DeviceDimensions);
};
__global__ void scifi_raw_bank_decoder_v4(Parameters, const char* scifi_geometry);
......
......@@ -14,7 +14,7 @@ namespace scifi_raw_bank_decoder_v6 {
DEVICE_INPUT(dev_cluster_references_t, uint) dev_cluster_references;
DEVICE_OUTPUT(dev_scifi_hits_t, char) dev_scifi_hits;
DEVICE_INPUT(dev_event_list_t, uint) dev_event_list;
PROPERTY(block_dim_t, DeviceDimensions, "block_dim", "block dimensions");
PROPERTY(block_dim_t, "block_dim", "block dimensions", DeviceDimensions);
};
__global__ void scifi_raw_bank_decoder_v6(Parameters, const char* scifi_geometry);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment