Skip to content

eps increase, window shrink, def vals #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kjplows merged 5 commits into from
Nov 21, 2025
Merged

eps increase, window shrink, def vals #600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bee6076
eps increase, window shrink, def vals
nathanielerowe Nov 5, 2025
0321a34
Merge branch 'develop' into bugfix/potfix
kjplows Nov 5, 2025
6853934
Add VP873Offset to CAFMaker
maxdubnowski Nov 14, 2025
4716e76
Merge branch 'develop' into bugfix/potfix
kjplows Nov 14, 2025
87afab0
Merge branch 'develop' into bugfix/potfix
kjplows Nov 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 47 additions & 47 deletions sbncode/BeamSpillInfoRetriever/POTTools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,42 +68,42 @@ namespace sbn::pot{
// initializing all of our device carriers
// device definitions can be found in BNBSpillInfo.h

double TOR860 = 0; // units e12 protons
double TOR875 = 0; // units e12 protons
double LM875A = 0; // units R/s
double LM875B = 0; // units R/s
double LM875C = 0; // units R/s
double HP873 = 0; // units mm
double VP873 = 0; // units mm; not in the first IFBeam query bunch
double HP875 = 0; // units mm
double VP875 = 0; // units mm
double HPTG1 = 0; // units mm
double VPTG1 = 0; // units mm
double HPTG2 = 0; // units mm
double VPTG2 = 0; // units mm
double BTJT2 = 0; // units Deg C
double THCURR = 0; // units kiloAmps
double M875HS = 0; // units mm
double M875VS = 0; // units mm
double M875HM = 0; // units mm
double M875VM = 0; // units mm
double M876HS = 0; // units mm
double M876VS = 0; // units mm
double M876HM = 0; // units mm
double M876VM = 0; // units mm
double TOR860 = -999; // units e12 protons
double TOR875 = -999; // units e12 protons
double LM875A = -999; // units R/s
double LM875B = -999; // units R/s
double LM875C = -999; // units R/s
double HP873 = -999; // units mm
double VP873 = -999; // units mm; not in the first IFBeam query bunch
double HP875 = -999; // units mm
double VP875 = -999; // units mm
double HPTG1 = -999; // units mm
double VPTG1 = -999; // units mm
double HPTG2 = -999; // units mm
double VPTG2 = -999; // units mm
double BTJT2 = -999; // units Deg C
double THCURR = -999; // units kiloAmps
double M875HS = -999; // units mm
double M875VS = -999; // units mm
double M875HM = -999; // units mm
double M875VM = -999; // units mm
double M876HS = -999; // units mm
double M876VS = -999; // units mm
double M876HM = -999; // units mm
double M876VM = -999; // units mm


double HP875Offset =0;//units mm; make a another separate IFBeam query bunch for offsets
double VP875Offset =0;//units mm
double VP873Offset =0;//units mm
double HPTG1Offset =0;//units mm
double HPTG2Offset =0;//units mm
double VPTG1Offset =0;//units mm
double VPTG2Offset =0;//units mm
double HP875Offset =-999;//units mm; make a another separate IFBeam query bunch for offsets
double VP875Offset =-999;//units mm
double VP873Offset =-999;//units mm
double HPTG1Offset =-999;//units mm
double HPTG2Offset =-999;//units mm
double VPTG1Offset =-999;//units mm
double VPTG2Offset =-999;//units mm

double TOR860_time = 0; // units s
double TOR860_time = -999; // units s

double FOM =0;
double FOM =-999;

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

bool BrokenClock(double time, std::unique_ptr<ifbeam_ns::BeamFolder> const& bfp)
{
double TOR860 = 0; // units e12 protons
double TOR875 = 0; // units e12 protons
double LM875A = 0; // units R/s
double LM875B = 0; // units R/s
double LM875C = 0; // units R/s
double HP875 = 0; // units mm
double VP875 = 0; // units mm
double HPTG1 = 0; // units mm
double VPTG1 = 0; // units mm
double HPTG2 = 0; // units mm
double VPTG2 = 0; // units mm
double BTJT2 = 0; // units Deg C
double THCURR = 0; // units kiloAmps
double TOR860 = -999; // units e12 protons
double TOR875 = -999; // units e12 protons
double LM875A = -999; // units R/s
double LM875B = -999; // units R/s
double LM875C = -999; // units R/s
double HP875 = -999; // units mm
double VP875 = -999; // units mm
double HPTG1 = -999; // units mm
double VPTG1 = -999; // units mm
double HPTG2 = -999; // units mm
double VPTG2 = -999; // units mm
double BTJT2 = -999; // units Deg C
double THCURR = -999; // units kiloAmps

double TOR860_time = 0; // units s
double TOR860_time = -999; // units s

// Here we request all the devices
// since sometimes devices fail to report we'll
Expand Down
2 changes: 1 addition & 1 deletion sbncode/BeamSpillInfoRetriever/SBNDBNBRetriever/SBNDBNBRetriever_module.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ sbn::SBNDBNBRetriever::SBNDBNBRetriever(fhicl::ParameterSet const & params)
vp873->set_epsilon(0.02);

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

}

Expand Down
2 changes: 1 addition & 1 deletion sbncode/BeamSpillInfoRetriever/job/sbndbnbdefaults.fcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ sbndbnbspillinfo: {
OffsetBundle: "BNB_BPM_settings"

TimeWindow: "700" #seconds
MWR_TimeWindow: "3601" #seconds
MWR_TimeWindow: "700" #seconds
DeviceUsedForTiming: "E:TOR860"
}

Expand Down
1 change: 1 addition & 0 deletions sbncode/CAFMaker/FillExposure.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ namespace caf
single_store.FOM = info.FOM;
single_store.VP873 = info.VP873;
single_store.VP875Offset = info.VP875Offset;
single_store.VP873Offset = info.VP873Offset;
single_store.HP875Offset = info.HP875Offset;
single_store.VPTG1Offset = info.VPTG1Offset;
single_store.HPTG1Offset = info.HPTG1Offset;
Expand Down