diff --git a/sbncode/BeamSpillInfoRetriever/SBNDBNBRetriever/SBNDBNBRetriever_module.cc b/sbncode/BeamSpillInfoRetriever/SBNDBNBRetriever/SBNDBNBRetriever_module.cc index d4fa877b5..f2d077daf 100644 --- a/sbncode/BeamSpillInfoRetriever/SBNDBNBRetriever/SBNDBNBRetriever_module.cc +++ b/sbncode/BeamSpillInfoRetriever/SBNDBNBRetriever/SBNDBNBRetriever_module.cc @@ -72,7 +72,7 @@ sbn::SBNDBNBRetriever::SBNDBNBRetriever(fhicl::ParameterSet const & params) vp873->set_epsilon(0.02); offsets = ifbeam_handle->getBeamFolder(params.get("OffsetBundle"), params.get("URL"), timeWindow); - offsets->set_epsilon(600); + offsets->set_epsilon(1000); } diff --git a/sbncode/BeamSpillInfoRetriever/SBNDPOTTools.cpp b/sbncode/BeamSpillInfoRetriever/SBNDPOTTools.cpp index 624dfdcd9..bcdb6e380 100644 --- a/sbncode/BeamSpillInfoRetriever/SBNDPOTTools.cpp +++ b/sbncode/BeamSpillInfoRetriever/SBNDPOTTools.cpp @@ -73,33 +73,33 @@ namespace sbn{ // 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 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 VP873 = 0; //units mm; not in the first IFBeam query bunch - 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 VP873 = -999; //units mm; not in the first IFBeam query bunch + 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 @@ -122,7 +122,7 @@ namespace sbn{ - try{bfp->GetNamedData(time, "E:VP873",&VP873);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";} + try{vp873->GetNamedData(time, "E:VP873",&VP873);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";} try{offsets->GetNamedData(time, "E_VP873S",&VP873Offset);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";} try{offsets->GetNamedData(time, "E_HP875S",&HP875Offset);}catch (WebAPIException &we) {mf::LogDebug("SBNDBNBRetriever")<< "At time : " << time << " " << "got exception: " << we.what() << "\n";} @@ -217,21 +217,21 @@ namespace sbn{ // if time is just a single outlier. bool BrokenClock(double time, std::unique_ptr 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 diff --git a/sbncode/BeamSpillInfoRetriever/job/sbndbnbdefaults.fcl b/sbncode/BeamSpillInfoRetriever/job/sbndbnbdefaults.fcl index 51cd8565a..94d6c0df9 100644 --- a/sbncode/BeamSpillInfoRetriever/job/sbndbnbdefaults.fcl +++ b/sbncode/BeamSpillInfoRetriever/job/sbndbnbdefaults.fcl @@ -12,7 +12,7 @@ sbndbnbspillinfo: { OffsetBundle: "BNB_BPM_settings" TimeWindow: "700" #seconds - MWR_TimeWindow: "3601" #seconds + MWR_TimeWindow: "700" #seconds DeviceUsedForTiming: "E:TOR860" } diff --git a/sbncode/BeamSpillInfoRetriever/job/sbndbnbspillinfo.fcl b/sbncode/BeamSpillInfoRetriever/job/sbndbnbspillinfo.fcl deleted file mode 100644 index 26327a100..000000000 --- a/sbncode/BeamSpillInfoRetriever/job/sbndbnbspillinfo.fcl +++ /dev/null @@ -1,17 +0,0 @@ -BEGIN_PROLOG - -sbndbnbspillinfo: { - module_type: "" - DebugLevel: 0 - TimePadding: 0.0333 #unit seconds, Booster Rep Rate is 15 Hz, so the closest spill could be 66ms away was 0.0333 - BESOffset: 0.035 #unit seconds, we expect the BES to be about 35 ms from $1D. Need to adjust search range accordingly. - URL: "" #Default URL having issues Nov 21 2024, used this instead https://dbdata3vm.fnal.gov:9443/ifbeam - Bundle: "BoosterNeutrinoBeam_read" - MultiWireBundle: "BNBMultiWire" - TimeWindow: "700" #seconds - MWR_TimeWindow: "3601" #seconds - DeviceUsedForTiming: "E:TOR860" -} - -END_PROLOG -