Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions source/LumiCalReco/include/GlobalMethodsClass.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,6 @@ class GlobalMethodsClass {
double toSignal(double valNow) const;
double toGev(double valNow) const;

void ThetaPhiCell(const int cellId, std::map<GlobalMethodsClass::Coordinate_t, double>& 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);
Expand Down
28 changes: 0 additions & 28 deletions source/LumiCalReco/src/GlobalMethodsClass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<GlobalMethodsClass::Coordinate_t, double>& 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 ){

Expand Down