From 29efd0b6ad8fbd5162b326b654604957a92281ea Mon Sep 17 00:00:00 2001 From: ROBINET Florent <robinet@lal.in2p3.fr> Date: Thu, 8 Aug 2024 16:02:39 +0200 Subject: [PATCH] new ffl class --- src/VVetoPerf.cc | 2 +- src/dq-print.cc | 4 ++-- src/vp-makeperf.cc | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/VVetoPerf.cc b/src/VVetoPerf.cc index e85c4f2..c3dff52 100644 --- a/src/VVetoPerf.cc +++ b/src/VVetoPerf.cc @@ -127,7 +127,7 @@ Segments* Veto::GetSegments(Segments *aInSegments){ if(!aInSegments->GetLiveTime()) return seg; // load frame file - if(!vetoffl->LoadFrameFile(aInSegments->GetFirst())) return seg; + if(!vetoffl->ExtractChannels(aInSegments->GetFirst())) return seg; // channel sampling unsigned int sampling = vetoffl->GetChannelSampling(vetoname); diff --git a/src/dq-print.cc b/src/dq-print.cc index fda16a3..77a06f3 100644 --- a/src/dq-print.cc +++ b/src/dq-print.cc @@ -195,8 +195,8 @@ int main (int argc, char* argv[]){ cout<<"\tdq-print gps="<<setprecision(15)<<gps_interest<<" gps-start="<<gps_start<<" gps-end="<<gps_end<<" channel=\""<<chfilter<<"\" channel-file="<<chfile<<" ffl="<<fflpath<<" active-value="<<chval<<" print="<<printtype<<" output="<<outfile<<endl; // ffl file - ffl *ffldata = new ffl(fflpath); - if(!ffldata->LoadFrameFile((unsigned int)gps_start)) return 2; + ffl *ffldata = new ffl(fflpath, "GWOLLUM", 0, ".", 1, 0); + if(!ffldata->ExtractChannels((unsigned int)gps_start)) return 2; // output file (print list only) ofstream ofs; diff --git a/src/vp-makeperf.cc b/src/vp-makeperf.cc index 46aed3b..f5cf0ad 100644 --- a/src/vp-makeperf.cc +++ b/src/vp-makeperf.cc @@ -251,8 +251,8 @@ int main (int argc, char* argv[]){ // input ffl ffl *fdata = NULL; if(filesystem::is_regular_file(fflpath)){ - fdata = new ffl(fflpath, "STANDARD"); - if(!fdata->LoadFrameFile(gps_end)) return 4; + fdata = new ffl(fflpath, "STANDARD", 0, ".", 1, 0); + if(!fdata->ExtractChannels(gps_end)) return 4; } // set ffl -- GitLab