Merge pull request #384 from JeffersonLab/dirc_fix

Dirc fix
JeffersonLab · May 29, 2020 · a13503b · a13503b
2 parents 0897620 + 340a2b3
commit a13503b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/libraries/DIRC/DDIRCLut.cc b/src/libraries/DIRC/DDIRCLut.cc
@@ -90,9 +90,9 @@ bool DDIRCLut::brun(JEventLoop *loop) {
 	  jout << "Can't find requested /DIRC/bar_rotation in CCDB for this run!" << endl;
 
 	for(int ibar=0; ibar<DDIRCGeometry::kBars; ibar++) {
-	    dRotationX[ibar] = bar_rotation[ibar].at("rotationX");
-	    dRotationY[ibar] = bar_rotation[ibar].at("rotationY");
-	    dRotationZ[ibar] = bar_rotation[ibar].at("rotationZ");
+	    dRotationX[ibar] = bar_rotation[ibar].at("rotationX")*TMath::DegToRad();
+	    dRotationY[ibar] = bar_rotation[ibar].at("rotationY")*TMath::DegToRad();
+	    dRotationZ[ibar] = bar_rotation[ibar].at("rotationZ")*TMath::DegToRad();
 	}
 
 	return true;

diff --git a/src/libraries/HDDM/DEventSourceREST.cc b/src/libraries/HDDM/DEventSourceREST.cc
@@ -1379,7 +1379,7 @@ jerror_t DEventSourceREST::Extract_DDetectorMatches(JEventLoop* locEventLoop, hd
       for(; dircIter != dircList.end(); ++dircIter)
       {
 	      size_t locTrackIndex = dircIter->getTrack();
-	      if(locTrackIndex > locTrackTimeBasedVector.size()) continue;
+	      if(locTrackIndex >= locTrackTimeBasedVector.size()) continue;
 
 	      auto locTrackTimeBased = locTrackTimeBasedVector[locTrackIndex];
 	      if( !locTrackTimeBased ) continue;