Porting to JANA2 after July17,2024 rebase

JeffersonLab · Aug 12, 2024 · d998055 · d998055
1 parent 530d4d9
commit d998055
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/plugins/Utilities/evio_writer/DEventWriterEVIO.cc b/src/plugins/Utilities/evio_writer/DEventWriterEVIO.cc
@@ -205,7 +205,7 @@ bool DEventWriterEVIO::Write_EVIOEvent(const std::shared_ptr<const JEvent>& locE
 		//check to see if the EVIO file is open
 		if(Get_EVIOOutputters().find(locOutputFileName) == Get_EVIOOutputters().end()) {
 			//not open, open it
-		  if(!Open_OutputFile(locEventLoop, locOutputFileName)){
+		  if(!Open_OutputFile(locEvent, locOutputFileName)){
 		    lockService->Unlock("EVIOWriter"); // release lock
 		    return false; //failed to open
 		  }

diff --git a/src/plugins/monitoring/FDC_Efficiency/JEventProcessor_FDC_Efficiency.cc b/src/plugins/monitoring/FDC_Efficiency/JEventProcessor_FDC_Efficiency.cc
@@ -310,9 +310,9 @@ void JEventProcessor_FDC_Efficiency::Process(const std::shared_ptr<const JEvent>
     for (unsigned int i = 0; i < pulls.size(); i++){
       const DFDCPseudo * thisTrackFDCHit = pulls[i].fdc_hit;
       if (thisTrackFDCHit != NULL){
-	japp->RootFillLock(this); //ACQUIRE ROOT FILL LOCK
+	lockService->RootFillLock(this); //ACQUIRE ROOT FILL LOCK
 	hPullTime[thisTrackFDCHit->wire->layer]->Fill(pulls[i].tdrift);
-	japp->RootFillUnLock(this); //RELEASE ROOT FILL LOCK
+	lockService->RootFillUnLock(this); //RELEASE ROOT FILL LOCK
 	if ( find(cellsHit.begin(), cellsHit.end(), thisTrackFDCHit->wire->layer) == cellsHit.end())
 	  cellsHit.push_back(thisTrackFDCHit->wire->layer);
       }

diff --git a/src/plugins/monitoring/FMWPC_Performance/JEventProcessor_FMWPC_Performance.cc b/src/plugins/monitoring/FMWPC_Performance/JEventProcessor_FMWPC_Performance.cc
@@ -442,7 +442,7 @@ void JEventProcessor_FMWPC_Performance::Process(const std::shared_ptr<const JEve
         double Jphi = atan2(JTy, JTx)*180/acos(-1);
 	double MLPClassifierMinus=cppepem->pimem_ML_classifier;
   	double MLPClassifierPlus=cppepem->pipep_ML_classifier;
-	japp->RootFillLock(this); //ACQUIRE ROOT FILL LOCK
+	DEvent::GetLockService(event)->RootFillLock(this); //ACQUIRE ROOT FILL LOCK
 	hpimem_ML_classifier->Fill(MLPClassifierMinus);
 	hpipep_ML_classifier->Fill(MLPClassifierPlus);
 	if(MLPClassifierPlus > 0.8 && MLPClassifierMinus > 0.8){
@@ -486,7 +486,7 @@ void JEventProcessor_FMWPC_Performance::Process(const std::shared_ptr<const JEve
 	    hCosTheta_mumu->Fill(CosTheta,weight);
 	    hCosTheta_vs_psi_mumu->Fill(psi*TMath::RadToDeg(), CosTheta);
 	  }
-	japp->RootFillUnLock(this); //RELEASE ROOT FILL LOCK
+	DEvent::GetLockService(event)->RootFillUnLock(this); //RELEASE ROOT FILL LOCK
   }