Merge pull request #9 from Mu2e/scorrodi/patchForV3_04_00

adjusted to changes in CRV decoders: restoring changes in commit 2231156

Author: eflumerf

otsdaq-mu2e-crv/ArtModules/CrvDQM_module.cc

@@ -345,7 +345,14 @@ void CrvDQM::analyze(art::Event const& e)
 								    mu2e::CRVDataDecoder(subevent);  // reference
 								// const auto crvStatus =
 								// crvData.GetCRVROCStatusPacket(bl);
-								auto hits = crvData.GetCRVHits(bl);
+								std::vector<mu2e::CRVDataDecoder::CRVHit> hits;
+								auto res = crvData.GetCRVHits(bl, hits);
+								if(!res)
+								{
+									TLOG(TLVL_ERROR) << "Unable to get CRV hist!";
+									continue;
+								}
+
 								for(auto& hit : hits)
 								{
 									// Fill histograms

otsdaq-mu2e-crv/ArtModules/CrvVstDemoViewer_module.cc

@@ -452,7 +452,14 @@ void CrvVstDemoViewer::analyze(art::Event const& event)
 						{
 							auto crvData = mu2e::CRVDataDecoder(subevent);  // reference
 							// const auto crvStatus = crvData.GetCRVROCStatusPacket(bl);
-							auto hits = crvData.GetCRVHits(bl);
+							std::vector<mu2e::CRVDataDecoder::CRVHit> hits;
+							auto res = crvData.GetCRVHits(bl, hits);
+							if(!res)
+							{
+								TLOG(TLVL_ERROR) << "Unable to get CRV hist!";
+								continue;
+							}
+
 							for(auto& hit : hits)
 							{
 								// if (newCanvas_) {