update to recent daq config

Author: lynnt20

sbndcode/Trigger/PMT/PMTMetricProducer_module.cc

@@ -181,7 +181,7 @@ void sbnd::trigger::pmtSoftwareTriggerProducer::reconfigure(fhicl::ParameterSet
   fStreamType         = p.get<uint8_t>("StreamType", 1); 
   // SPEC TDC ETT (or PTB gate HLT) [0] -> NTB (RawEventHeader) [1]
   fTimingType         = p.get<uint8_t>("TimingType", 0);
-  fAllowNTB           = p.get<bool>("AllowNTB", true);
+  fAllowNTB           = p.get<bool>("AllowNTB", false);
   fNTBDelay           = p.get<uint32_t>("NTBDelay", 365000); // units of ns
 
   fSPECTDCModuleLabel    = p.get<std::string>("SPECTDCModuleLabel", "daq");
@@ -203,7 +203,7 @@ void sbnd::trigger::pmtSoftwareTriggerProducer::reconfigure(fhicl::ParameterSet
 
   // most likely these will all be off...
   fIncludeExtensions  = p.get<bool>("IncludeExtensions",false);
-  fCalculateBaseline  = p.get<bool>("CalculateBaseline",false);
+  fCalculateBaseline  = p.get<bool>("CalculateBaseline",true);
   fCountPMTs          = p.get<bool>("CountPMTs",false);
   fCalculatePEMetrics = p.get<bool>("CalculatePEMetrics",false);
   fInputBaseline      = p.get<std::vector<float>>("InputBaseline",{14250,2.0});
@@ -245,6 +245,8 @@ void sbnd::trigger::pmtSoftwareTriggerProducer::produce(art::Event& e)
     for (const std::string &PTBInstanceLabel : fPTBInstanceLabels){
       art::Handle<std::vector<artdaq::Fragment>> ptbHandle;
       e.getByLabel(fPTBModuleLabel, PTBInstanceLabel, ptbHandle);
+      if(!ptbHandle.isValid() || ptbHandle->size() == 0)
+        continue;
       foundgate = getGateTime(ptbHandle, gateTime);
     }
   }

sbndcode/Trigger/PMT/metric_fcls/pmtmetricproducer.fcl

@@ -2,13 +2,9 @@ BEGIN_PROLOG
 
 pmtmetricproducer: {
         module_type: "PMTMetricProducer" 
-        CAENInstanceLabels: ["ContainerCAENV1730" ]
-
-        FragIDs: [40960,40961,40962,40963,40964,40965,40966,40967]
-        FlashThreshold: 1
-        CalculateBaseline: true
-        MetricInstanceLabel: "offline"
-        IncludeExtensions: true
-        AllowNTB: false
+        is_persistable: true 
+        IncludeExtensions: true 
+        Verbose: 1
+        StreamType: 1
 }
 END_PROLOG