diff --git a/offline/packages/mbd/MbdEvent.cc b/offline/packages/mbd/MbdEvent.cc index 62a6c96fe7..e5ae966587 100644 --- a/offline/packages/mbd/MbdEvent.cc +++ b/offline/packages/mbd/MbdEvent.cc @@ -156,7 +156,7 @@ int MbdEvent::InitRun() { // Download calibrations int status = _mbdcal->Download_All(); - if ( status == -1 ) + if ( status < 0 && _calpass==0 ) // only abort for normal processing { return Fun4AllReturnCodes::ABORTRUN; } diff --git a/offline/packages/mbd/MbdReco.h b/offline/packages/mbd/MbdReco.h index eced3b89e9..13a635d602 100644 --- a/offline/packages/mbd/MbdReco.h +++ b/offline/packages/mbd/MbdReco.h @@ -40,6 +40,8 @@ class MbdReco : public SubsysReco void SetProcChargeCh(const bool s) { _always_process_charge = s; } void SetMbdTrigOnly(const int m) { _mbdonly = m; } + MbdEvent* GetMbdEvent() { return m_mbdevent.get(); } + private: int createNodes(PHCompositeNode *topNode); int getNodes(PHCompositeNode *topNode); diff --git a/offline/packages/mbd/MbdSig.cc b/offline/packages/mbd/MbdSig.cc index 9b270e8ee8..155d731719 100644 --- a/offline/packages/mbd/MbdSig.cc +++ b/offline/packages/mbd/MbdSig.cc @@ -311,11 +311,13 @@ void MbdSig::SetXY(const Float_t* x, const Float_t* y, const int invert) Remove_Pileup(); } + /* if ( _verbose && _ch==9 ) { std::cout << "SetXY: ch " << _ch << std::endl; gSubPulse->Print("ALL"); } + */ } _evt_counter++;