Skip to content

Commit 5511e2c

Browse files
committed
merge to one hipo
1 parent 72592e8 commit 5511e2c

1 file changed

Lines changed: 11 additions & 37 deletions

File tree

src/main/java/org/jlab/clas/timeline/analysis/forward/forward_Tracking_EleVz.groovy

Lines changed: 11 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -132,58 +132,32 @@ def write() {
132132
if (data_2nd_peak.size() != 0) {
133133
out.addDataSet(grtl_2nd_peak)
134134
}
135-
}
136-
137-
out.writeFile('forward_electron_VZ.hipo')
138-
139-
if (data_upstream.size() != 0) {
140135

141-
TDirectory out_upstream = new TDirectory()
142-
out_upstream.mkdir('/timelines')
143-
(0..<6).each{ sec->
144-
def grtl_upstream = new GraphErrors('sec'+(sec+1))
136+
if (data_upstream.size() != 0) {
137+
def grtl_upstream = new GraphErrors('sec'+(sec+1)+'_upstream')
145138
grtl_upstream.setTitle("VZ (upstream peak value) for electrons per sector")
146139
grtl_upstream.setTitleY("VZ (upstream peak value) for electrons per sector (cm)")
147140
grtl_upstream.setTitleX("run number")
148141

149-
data_upstream.sort{it.key}.each{run,it->
150-
if (sec==0){
151-
out_upstream.mkdir('/'+it.run)
152-
}
153-
out_upstream.cd('/'+it.run)
154-
out_upstream.addDataSet(it.hlist[sec])
155-
out_upstream.addDataSet(it.flist[sec])
156-
grtl_upstream.addPoint(it.run, it.mean[sec], 0, 0)
157-
}
158-
159-
out_upstream.cd('/timelines')
160-
out_upstream.addDataSet(grtl_upstream)
161-
}
162-
out_upstream.writeFile('forward_electron_VZ_upstream.hipo')
163-
164-
TDirectory out_window = new TDirectory()
165-
out_window.mkdir('/timelines')
166-
(0..<6).each{ sec->
167-
def grtl_window = new GraphErrors('sec'+(sec+1))
142+
def grtl_window = new GraphErrors('sec'+(sec+1)+'_window')
168143
grtl_window.setTitle("VZ target window length (downstream - upstream peak distance) per sector")
169144
grtl_window.setTitleY("VZ target window length (cm)")
170145
grtl_window.setTitleX("run number")
171146

172147
data_upstream.sort{it.key}.each{run,it->
173-
if (sec==0){
174-
out_window.mkdir('/'+it.run)
175-
}
176-
out_window.cd('/'+it.run)
177-
out_window.addDataSet(it.hlist[sec])
148+
out.cd('/'+it.run)
149+
out.addDataSet(it.flist[sec])
150+
grtl_upstream.addPoint(it.run, it.mean[sec], 0, 0)
178151
def window_length = (data[run].mean[sec] - it.mean[sec]).abs()
179152
grtl_window.addPoint(it.run, window_length, 0, 0)
180153
}
181154

182-
out_window.cd('/timelines')
183-
out_window.addDataSet(grtl_window)
155+
out.cd('/timelines')
156+
out.addDataSet(grtl_upstream)
157+
out.addDataSet(grtl_window)
184158
}
185-
out_window.writeFile('forward_electron_VZ_target_window_length.hipo')
186-
187159
}
160+
161+
out.writeFile('forward_electron_VZ.hipo')
188162
}
189163
}

0 commit comments

Comments
 (0)