Skip to content

Commit 7c82c2e

Browse files
kjplowskjplows
authored
Merge pull request #600 from SBNSoftware/bugfix/potfix
eps increase, window shrink, def vals
2 parents 92867a7 + 87afab0 commit 7c82c2e

4 files changed

Lines changed: 50 additions & 49 deletions

File tree

‎sbncode/BeamSpillInfoRetriever/POTTools.cpp‎

Lines changed: 47 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -68,42 +68,42 @@ namespace sbn::pot{
6868
// initializing all of our device carriers
6969
// device definitions can be found in BNBSpillInfo.h
7070

71-
double TOR860 = 0; // units e12 protons
72-
double TOR875 = 0; // units e12 protons
73-
double LM875A = 0; // units R/s
74-
double LM875B = 0; // units R/s
75-
double LM875C = 0; // units R/s
76-
double HP873 = 0; // units mm
77-
double VP873 = 0; // units mm; not in the first IFBeam query bunch
78-
double HP875 = 0; // units mm
79-
double VP875 = 0; // units mm
80-
double HPTG1 = 0; // units mm
81-
double VPTG1 = 0; // units mm
82-
double HPTG2 = 0; // units mm
83-
double VPTG2 = 0; // units mm
84-
double BTJT2 = 0; // units Deg C
85-
double THCURR = 0; // units kiloAmps
86-
double M875HS = 0; // units mm
87-
double M875VS = 0; // units mm
88-
double M875HM = 0; // units mm
89-
double M875VM = 0; // units mm
90-
double M876HS = 0; // units mm
91-
double M876VS = 0; // units mm
92-
double M876HM = 0; // units mm
93-
double M876VM = 0; // units mm
71+
double TOR860 = -999; // units e12 protons
72+
double TOR875 = -999; // units e12 protons
73+
double LM875A = -999; // units R/s
74+
double LM875B = -999; // units R/s
75+
double LM875C = -999; // units R/s
76+
double HP873 = -999; // units mm
77+
double VP873 = -999; // units mm; not in the first IFBeam query bunch
78+
double HP875 = -999; // units mm
79+
double VP875 = -999; // units mm
80+
double HPTG1 = -999; // units mm
81+
double VPTG1 = -999; // units mm
82+
double HPTG2 = -999; // units mm
83+
double VPTG2 = -999; // units mm
84+
double BTJT2 = -999; // units Deg C
85+
double THCURR = -999; // units kiloAmps
86+
double M875HS = -999; // units mm
87+
double M875VS = -999; // units mm
88+
double M875HM = -999; // units mm
89+
double M875VM = -999; // units mm
90+
double M876HS = -999; // units mm
91+
double M876VS = -999; // units mm
92+
double M876HM = -999; // units mm
93+
double M876VM = -999; // units mm
9494

9595

96-
double HP875Offset =0;//units mm; make a another separate IFBeam query bunch for offsets
97-
double VP875Offset =0;//units mm
98-
double VP873Offset =0;//units mm
99-
double HPTG1Offset =0;//units mm
100-
double HPTG2Offset =0;//units mm
101-
double VPTG1Offset =0;//units mm
102-
double VPTG2Offset =0;//units mm
96+
double HP875Offset =-999;//units mm; make a another separate IFBeam query bunch for offsets
97+
double VP875Offset =-999;//units mm
98+
double VP873Offset =-999;//units mm
99+
double HPTG1Offset =-999;//units mm
100+
double HPTG2Offset =-999;//units mm
101+
double VPTG1Offset =-999;//units mm
102+
double VPTG2Offset =-999;//units mm
103103

104-
double TOR860_time = 0; // units s
104+
double TOR860_time = -999; // units s
105105

106-
double FOM =0;
106+
double FOM =-999;
107107

108108
// Here we request all the devices
109109
// since sometimes devices fail to report we'll
@@ -116,7 +116,7 @@ namespace sbn::pot{
116116
try{bfp->GetNamedData(time, "E:LM875B",&LM875B);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
117117
try{bfp->GetNamedData(time, "E:LM875C",&LM875C);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
118118
try{bfp->GetNamedData(time, "E:HP873",&HP873);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
119-
try{bfp->GetNamedData(time, "E:VP873",&VP873);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
119+
try{vp873->GetNamedData(time, "E:VP873",&VP873);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
120120
try{bfp->GetNamedData(time, "E:HP875",&HP875);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
121121
try{bfp->GetNamedData(time, "E:VP875",&VP875);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
122122
try{bfp->GetNamedData(time, "E:HPTG1",&HPTG1);}catch (WebAPIException &we) {mf::LogDebug("BNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";}
@@ -231,21 +231,21 @@ namespace sbn::pot{
231231

232232
bool BrokenClock(double time, std::unique_ptr<ifbeam_ns::BeamFolder> const& bfp)
233233
{
234-
double TOR860 = 0; // units e12 protons
235-
double TOR875 = 0; // units e12 protons
236-
double LM875A = 0; // units R/s
237-
double LM875B = 0; // units R/s
238-
double LM875C = 0; // units R/s
239-
double HP875 = 0; // units mm
240-
double VP875 = 0; // units mm
241-
double HPTG1 = 0; // units mm
242-
double VPTG1 = 0; // units mm
243-
double HPTG2 = 0; // units mm
244-
double VPTG2 = 0; // units mm
245-
double BTJT2 = 0; // units Deg C
246-
double THCURR = 0; // units kiloAmps
234+
double TOR860 = -999; // units e12 protons
235+
double TOR875 = -999; // units e12 protons
236+
double LM875A = -999; // units R/s
237+
double LM875B = -999; // units R/s
238+
double LM875C = -999; // units R/s
239+
double HP875 = -999; // units mm
240+
double VP875 = -999; // units mm
241+
double HPTG1 = -999; // units mm
242+
double VPTG1 = -999; // units mm
243+
double HPTG2 = -999; // units mm
244+
double VPTG2 = -999; // units mm
245+
double BTJT2 = -999; // units Deg C
246+
double THCURR = -999; // units kiloAmps
247247

248-
double TOR860_time = 0; // units s
248+
double TOR860_time = -999; // units s
249249

250250
// Here we request all the devices
251251
// since sometimes devices fail to report we'll

‎sbncode/BeamSpillInfoRetriever/SBNDBNBRetriever/SBNDBNBRetriever_module.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ sbn::SBNDBNBRetriever::SBNDBNBRetriever(fhicl::ParameterSet const & params)
7171
vp873->set_epsilon(0.02);
7272

7373
offsets = ifbeam_handle->getBeamFolder(params.get<std::string>("OffsetBundle"), params.get<std::string>("URL"), timeWindow);
74-
offsets->set_epsilon(600);
74+
offsets->set_epsilon(1000);
7575

7676
}
7777

‎sbncode/BeamSpillInfoRetriever/job/sbndbnbdefaults.fcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ sbndbnbspillinfo: {
1212
OffsetBundle: "BNB_BPM_settings"
1313

1414
TimeWindow: "700" #seconds
15-
MWR_TimeWindow: "3601" #seconds
15+
MWR_TimeWindow: "700" #seconds
1616
DeviceUsedForTiming: "E:TOR860"
1717
}
1818

‎sbncode/CAFMaker/FillExposure.cxx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ namespace caf
2626
single_store.FOM = info.FOM;
2727
single_store.VP873 = info.VP873;
2828
single_store.VP875Offset = info.VP875Offset;
29+
single_store.VP873Offset = info.VP873Offset;
2930
single_store.HP875Offset = info.HP875Offset;
3031
single_store.VPTG1Offset = info.VPTG1Offset;
3132
single_store.HPTG1Offset = info.HPTG1Offset;

0 commit comments

Comments
 (0)