Skip to content

Commit 122e9f4

Browse files
SangbaekSangbaek
committed
Add zero padding for readability in the front end
1 parent df06635 commit 122e9f4

4 files changed

Lines changed: 35 additions & 33 deletions

File tree

‎src/main/java/org/jlab/clas/timeline/analysis/alert/alert_ahdc_adc.groovy‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ int number_of_wires_per_timeline;
2525
}
2626

2727
def getName() {
28-
return "${this.class.simpleName}_${layer}"
28+
return "${this.class.simpleName}_${layer_number}"
2929
}
3030

3131
def processRun(dir, run) {
@@ -36,16 +36,16 @@ int number_of_wires_per_timeline;
3636
// data[run].put('bits', trigger)
3737
float integral = 0;
3838
(1..number_of_wires_this_layer).collect{wire_number->
39-
def h1 = dir.getObject(String.format('/ALERT/ADC_layer%d_wire_number%d', layer, wire_number))
39+
def h1 = dir.getObject(String.format('/ALERT/ADC_layer%d_wire_number%02d', layer_number, wire_number))
4040
if(h1!=null) {
4141
if (h1.getBinContent(h1.getMaximumBin()) > 30 && h1.getEntries()>300){
42-
data[run].put(String.format('ahdc_adc_layer%d_wire_number%d', layer, wire_number), h1)
42+
data[run].put(String.format('ahdc_adc_layer%d_wire_number%02d', layer_number, wire_number), h1)
4343
integral = h1.integral()
4444
// def f1 = ALERTFitter.totfitter(h1)
45-
// data[run].put(String.format('fit_adc_layer%d_wire_number%d', layer, wire_number), f1)
46-
// data[run].put(String.format('peak_location_ahdc_adc_layer%d_wire_number%d', layer, wire_number), peak_location)
47-
// data[run].put(String.format('sigma_adc_layer%d_wire_number%d', layer, wire_number), f1.getParameter(2).abs())
48-
data[run].put(String.format('integral_normalized_to_trigger_ahdc_adc_layer%d_wire_number%d', layer, wire_number), integral/trigger.getBinContent(reference_trigger_bit) )
45+
// data[run].put(String.format('fit_adc_layer%d_wire_number%02d', layer_number, wire_number), f1)
46+
// data[run].put(String.format('peak_location_ahdc_adc_layer%d_wire_number%02d', layer_number, wire_number), peak_location)
47+
// data[run].put(String.format('sigma_adc_layer%d_wire_number%02d', layer_number, wire_number), f1.getParameter(2).abs())
48+
data[run].put(String.format('integral_normalized_to_trigger_ahdc_adc_layer%d_wire_number%02d', layer_number, wire_number), integral/trigger.getBinContent(reference_trigger_bit) )
4949
has_data.set(true)
5050
}
5151
}
@@ -72,10 +72,10 @@ int number_of_wires_per_timeline;
7272
(1..number_of_wires_this_timeline).collect{wire_index->
7373
def wire_number = wire_index + 15* timeline_index
7474
if (wire_number <= number_of_wires_this_layer){
75-
def name = String.format('ahdc_adc_layer%d_wire_number%d', layer, wire_number)
75+
def name = String.format('ahdc_adc_layer%d_wire_number%02d', layer_number, wire_number)
7676
def gr = new GraphErrors(name)
77-
gr.setTitle( String.format("AHDC ADC %s layer %d", variable.replace('_', ' '), layer))
78-
gr.setTitleY( String.format("AHDC ADC %s layer %d", variable.replace('_', ' '), layer))
77+
gr.setTitle( String.format("AHDC ADC %s layer %d", variable.replace('_', ' '), layer_number))
78+
gr.setTitleY( String.format("AHDC ADC %s layer %d", variable.replace('_', ' '), layer_number))
7979
gr.setTitleX("run number")
8080
data.sort{it.key}.each{run,it->
8181
out.mkdir('/'+it.run)
@@ -91,7 +91,7 @@ int number_of_wires_per_timeline;
9191
out.addDataSet(gr)
9292
}
9393
}
94-
out.writeFile(String.format('alert_ahdc_adc_%s_layer%d_%d.hipo', variable, layer, timeline_index))
94+
out.writeFile(String.format('alert_ahdc_adc_%s_layer%d_%d.hipo', variable, layer_number, timeline_index))
9595
}
9696
}
9797
}

‎src/main/java/org/jlab/clas/timeline/analysis/alert/alert_ahdc_time.groovy‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ int number_of_wires_per_timeline;
2525
}
2626

2727
def getName() {
28-
return "${this.class.simpleName}_${layer}"
28+
return "${this.class.simpleName}_${layer_number}"
2929
}
3030

3131
def processRun(dir, run) {
@@ -36,10 +36,10 @@ int number_of_wires_per_timeline;
3636
// data[run].put('bits', trigger)
3737
float integral = 0;
3838
(1..number_of_wires_this_layer).collect{wire_number->
39-
def h1 = dir.getObject(String.format("/ALERT/AHDC_TIME_layer%d_wire_number%d", layer, wire_number))
39+
def h1 = dir.getObject(String.format("/ALERT/AHDC_TIME_layer%d_wire_number%02d", layer_number, wire_number))
4040
if(h1!=null) {
4141
if (h1.getBinContent(h1.getMaximumBin()) > 30 && h1.getEntries()>300){
42-
data[run].put(String.format('ahdc_time_layer%d_wire_number%d', layer, wire_number), h1)
42+
data[run].put(String.format('ahdc_time_layer%d_wire_number%02d', layer_number, wire_number), h1)
4343
def maxz = h1.getBinContent(h1.getMaximumBin());
4444
//int t0bin = (0..<h1.getMaximumBin()).find {
4545
// h1.getBinContent(it) >= 0.25 * maxz
@@ -53,12 +53,12 @@ int number_of_wires_per_timeline;
5353
}
5454
float tmax = h1.getAxis().getBinCenter(tmaxbin)
5555
float width = tmax - t0
56-
data[run].put(String.format('t0_ahdc_time_layer%d_wire_number%d', layer, wire_number), t0)
57-
data[run].put(String.format('tmax_ahdc_time_layer%d_wire_number%d', layer, wire_number), tmax)
58-
data[run].put(String.format('width_ahdc_time_layer%d_wire_number%d', layer, wire_number), width)
59-
data[run].put(String.format('fit_t0_ahdc_time_layer%d_wire_number%d', layer, wire_number), ALERTFitter.time_fitter_rising(h1, t0))
60-
data[run].put(String.format('fit_tmax_ahdc_time_layer%d_wire_number%d', layer, wire_number), ALERTFitter.time_fitter_falling(h1, tmax))
61-
data[run].put(String.format('fit_width_ahdc_time_layer%d_wire_number%d', layer, wire_number), ALERTFitter.time_fitter_width(h1, t0, tmax))
56+
data[run].put(String.format('t0_ahdc_time_layer%d_wire_number%02d', layer_number, wire_number), t0)
57+
data[run].put(String.format('tmax_ahdc_time_layer%d_wire_number%02d', layer_number, wire_number), tmax)
58+
data[run].put(String.format('width_ahdc_time_layer%d_wire_number%02d', layer_number, wire_number), width)
59+
data[run].put(String.format('fit_t0_ahdc_time_layer%d_wire_number%02d', layer_number, wire_number), ALERTFitter.time_fitter_rising(h1, t0))
60+
data[run].put(String.format('fit_tmax_ahdc_time_layer%d_wire_number%02d', layer_number, wire_number), ALERTFitter.time_fitter_falling(h1, tmax))
61+
data[run].put(String.format('fit_width_ahdc_time_layer%d_wire_number%02d', layer_number, wire_number), ALERTFitter.time_fitter_width(h1, t0, tmax))
6262
has_data.set(true)
6363
}
6464
}
@@ -85,10 +85,10 @@ int number_of_wires_per_timeline;
8585
(1..number_of_wires_this_timeline).collect{wire_index->
8686
def wire_number = wire_index + 15* timeline_index
8787
if (wire_number <= number_of_wires_this_layer){
88-
def name = String.format('ahdc_time_layer%d_wire_number%d', layer, wire_number)
88+
def name = String.format('ahdc_time_layer%d_wire_number%02d', layer_number, wire_number)
8989
def gr = new GraphErrors(name)
90-
gr.setTitle( String.format("AHDC Time %s Layer %d", variable.replace('_', ' '), layer))
91-
gr.setTitleY( String.format("AHDC Time %s Layer %d", variable.replace('_', ' '), layer))
90+
gr.setTitle( String.format("AHDC Time %s Layer %d", variable.replace('_', ' '), layer_number))
91+
gr.setTitleY( String.format("AHDC Time %s Layer %d", variable.replace('_', ' '), layer_number))
9292
gr.setTitleX("run number")
9393
data.sort{it.key}.each{run,it->
9494
out.mkdir('/'+it.run)
@@ -104,7 +104,7 @@ int number_of_wires_per_timeline;
104104
out.addDataSet(gr)
105105
}
106106
}
107-
out.writeFile(String.format('alert_ahdc_time_%s_layer%d_%d.hipo', variable, layer, timeline_index))
107+
out.writeFile(String.format('alert_ahdc_time_%s_layer%d_%d.hipo', variable, layer_number, timeline_index))
108108
}
109109
}
110110
}

‎src/main/java/org/jlab/clas/timeline/analysis/alert/alert_atof_time.groovy‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ int max_index;
2020
}
2121

2222
def getName() {
23-
return "${this.class.simpleName}_${sector}"
23+
return "${this.class.simpleName}_${String.format('%02d', sector)}"
2424
}
2525

2626
def processRun(dir, run) {
@@ -34,7 +34,7 @@ int max_index;
3434
assert sector == atof_sector // sanity-check. this should be the same.
3535
int layer = (index % (11 * 4)) / 11;
3636
int component = index % 11;
37-
def file_index = String.format('sector%d_layer%d_component%d', sector, layer, component)
37+
def file_index = String.format('sector%02d_layer%d_component%02d', sector, layer, component)
3838
def h1 = dir.getObject(String.format('/ALERT/ATOF_Time_%s', file_index))
3939
if(h1!=null) {
4040
if (h1.getBinContent(h1.getMaximumBin()) > 30 && h1.getEntries()>300){
@@ -66,13 +66,13 @@ int max_index;
6666
out.mkdir('/timelines')
6767
(0..<11).collect{component->
6868
def file_index = ''
69-
file_index = String.format('sector%d_layer%d_component%d', sector, layer, component)
69+
file_index = String.format('sector%02d_layer%d_component%02d', sector, layer, component)
7070
names << String.format('atof_time_%s', file_index)
7171
}
7272
names.each{ name ->
7373
def gr = new GraphErrors(name)
74-
gr.setTitle( String.format("ATOF Time %s sector %d layer %d", variable.replace('_', ' '), sector, layer))
75-
gr.setTitleY( String.format("ATOF Time %s sector %d layer %d (ns)", variable.replace('_', ' '), sector, layer))
74+
gr.setTitle( String.format("ATOF Time %s sector %02d layer %d", variable.replace('_', ' '), sector, layer))
75+
gr.setTitleY( String.format("ATOF Time %s sector %02d layer %d (ns)", variable.replace('_', ' '), sector, layer))
7676
gr.setTitleX("run number")
7777
data.sort{it.key}.each{run,it->
7878
out.mkdir('/'+it.run)
@@ -87,7 +87,7 @@ int max_index;
8787
out.cd('/timelines')
8888
out.addDataSet(gr)
8989
}
90-
out.writeFile(String.format('alert_atof_time_%s_sector%d_layer%d.hipo', variable, sector, layer))
90+
out.writeFile(String.format('alert_atof_time_%s_sector%02d_layer%d.hipo', variable, sector, layer))
9191
}
9292
}
9393
}

‎src/main/java/org/jlab/clas/timeline/histograms/ALERT.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public ALERT(int reqrunNum, String reqOutputDir, float reqEb, boolean reqTimeBas
6868
layer = (index % (11 * 4)) / 11;
6969
component = index % 11;
7070

71-
ATOF_Time[index] = new H1F(String.format("ATOF_Time_sector%d_layer%d_component%d", sector, layer, component), String.format("ATOF Time sector%d layer%d component%d", sector, layer, component), 300, 85, 100);
71+
ATOF_Time[index] = new H1F(String.format("ATOF_Time_sector%02d_layer%d_component%02d", sector, layer, component), String.format("ATOF Time sector%02d layer%d component%02d", sector, layer, component), 300, 85, 100);
7272
ATOF_Time[index].setTitleX("ATOF Time (ns)");
7373
ATOF_Time[index].setTitleY("Counts");
7474
ATOF_Time[index].setFillColor(4);
@@ -81,20 +81,22 @@ public ALERT(int reqrunNum, String reqOutputDir, float reqEb, boolean reqTimeBas
8181

8282
for (int index = 0; index<576; index++) {
8383
int layer = 0;
84+
int layer_number = 0;
8485
int wire_number = 0;
8586

8687
for (int j=0; j<8; j++){
8788
if (index < layer_wires_cumulative[j+1]){
8889
layer = layer_encoding[j];
90+
layer_number = j + 1;
8991
wire_number = index + 1 - layer_wires_cumulative[j];
9092
break;
9193
}
9294
}
93-
ADC[index] = new H1F(String.format("ADC_layer%d_wire_number%d", layer, wire_number), String.format("ADC layer%d wire number%d", layer, wire_number), 516, 0.0, 3612.0);
95+
ADC[index] = new H1F(String.format("ADC_layer%d_wire_number%02d", layer_number, wire_number), String.format("ADC layer%d wire number%02d", layer_number, wire_number), 516, 0.0, 3612.0);
9496
ADC[index].setTitleX("ADC");
9597
ADC[index].setTitleY("Counts");
9698
ADC[index].setFillColor(4);
97-
AHDC_TIME[index] = new H1F(String.format("AHDC_TIME_layer%d_wire_number%d", layer, wire_number), String.format("AHDC Time layer %d wire number%d", layer, wire_number), 450, -10.f, 440.0f);
99+
AHDC_TIME[index] = new H1F(String.format("AHDC_TIME_layer%d_wire_number%02d", layer_number, wire_number), String.format("AHDC Time layer %d wire number%02d", layer_number, wire_number), 450, -10.f, 440.0f);
98100
AHDC_TIME[index].setTitleX("AHDC TIME (ns)");
99101
AHDC_TIME[index].setTitleY("Counts");
100102
AHDC_TIME[index].setFillColor(4);

0 commit comments

Comments
 (0)
⚡