diff --git a/source/LumiCalReco/include/GlobalMethodsClass.h b/source/LumiCalReco/include/GlobalMethodsClass.h index eccebe1..9b474cc 100644 --- a/source/LumiCalReco/include/GlobalMethodsClass.h +++ b/source/LumiCalReco/include/GlobalMethodsClass.h @@ -94,8 +94,6 @@ class GlobalMethodsClass { double toSignal(double valNow) const; double toGev(double valNow) const; - void ThetaPhiCell(const int cellId, std::map& thetaPhiCell) const; - static void CellIdZPR(int cellId, int& cellZ, int& cellPhi, int& cellR, int& arm); static int CellIdZPR(int cellZ, int cellPhi, int cellR, int arm); static int CellIdZPR(int cellId, Coordinate_t ZPR); diff --git a/source/LumiCalReco/src/GlobalMethodsClass.cpp b/source/LumiCalReco/src/GlobalMethodsClass.cpp index faf2e92..f5cbfe8 100644 --- a/source/LumiCalReco/src/GlobalMethodsClass.cpp +++ b/source/LumiCalReco/src/GlobalMethodsClass.cpp @@ -199,34 +199,6 @@ double GlobalMethodsClass::toSignal(double value) const { return value * getCali double GlobalMethodsClass::toGev(double value) const { return value / getCalibrationFactor(); } -void GlobalMethodsClass::ThetaPhiCell(const int cellId, - std::map& thetaPhiCell) const { - // compute Z,Phi,R coordinates according to the cellId - // returned Phi is in the range (-M_PI, M_PI ) - - int cellIdZ, cellIdPhi, cellIdR, arm; - CellIdZPR(cellId, cellIdZ, cellIdPhi, cellIdR, arm); - - // theta - double rCell = GlobalParamD.at(RMin) + (cellIdR + 0.5) * GlobalParamD.at(RCellLength) - GlobalParamD.at(RCellOffset); - double zCell = - fabs(GlobalParamD.at(ZStart)) + GlobalParamD.at(ZLayerThickness) * (cellIdZ) + GlobalParamD.at(ZLayerZOffset); - double thetaCell = atan(rCell / zCell); - - // phi - //(BP) use phiCell size and account for possible layers relative offset/stagger - // double phiCell = 2 * M_PI * (double(cellIdPhi) + .5) / double(GlobalParamI[NumCellsPhi]) + double( cellIdZ % 2 ) * GlobalParamD[; - double phiCell = (double(cellIdPhi)) * GlobalParamD.at(PhiCellLength) + - double((cellIdZ) % 2) * GlobalParamD.at(ZLayerPhiOffset) + GlobalParamD.at(PhiCellOffset); - phiCell = ( phiCell > M_PI ) ? phiCell-2.*M_PI : phiCell; - // fill output container - thetaPhiCell[GlobalMethodsClass::COTheta] = thetaCell; - thetaPhiCell[GlobalMethodsClass::COPhi] = phiCell; - thetaPhiCell[GlobalMethodsClass::COR] = rCell; - thetaPhiCell[GlobalMethodsClass::COZ] = zCell; - return; -} - std::string GlobalMethodsClass::GetParameterName ( Parameter_t par ){