Skip to content

Commit

Permalink
* convert hard-wired mwpc wire offset and pitch into named static
Browse files Browse the repository at this point in the history
  constants, and convert to internal units. [rtj]
  • Loading branch information
rjones30 committed Apr 13, 2021
1 parent 1ee4ad1 commit ab6e38b
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/GlueXSensitiveDetectorFMWPC.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ double GlueXSensitiveDetectorFMWPC::TWO_HIT_TIME_RESOL = 400*ns;
// Minimum photoelectron count for a hit
double GlueXSensitiveDetectorFMWPC::THRESH_KEV = 0.;

// Coordinate of wire 0, transverse to wire direction
double GlueXSensitiveDetectorFMWPC::WIRE_OFFSET = -73*cm;

// Minimum photoelectron count for a hit
double GlueXSensitiveDetectorFMWPC::WIRE_PITCH = 1.0*cm;

int GlueXSensitiveDetectorFMWPC::instanceCount = 0;
G4Mutex GlueXSensitiveDetectorFMWPC::fMutex = G4MUTEX_INITIALIZER;

Expand Down Expand Up @@ -184,15 +190,15 @@ G4bool GlueXSensitiveDetectorFMWPC::ProcessHits(G4Step* step,
int wire = 0;
if (layer % 2 != 0) {
// Vertical wires
wire = floor(x[0]/cm + 73.0);
wire = floor(x[0] - WIRE_OFFSET)/WIRE_PITCH;
}
else {
// Horizontal wires
wire = floor(x[1]/cm + 73.0);
wire = floor(x[1] - WIRE_OFFSET)/WIRE_PITCH;
}
if (layer == 6) {
// Vertical wires
wire = floor(x[0]/cm + 73.0);
wire = floor(x[0] - WIRE_OFFSET)/WIRE_PITCH;
}

//cout<<"MWPC: layer/wire = "<<layer<<" / "<<wire<<endl;
Expand Down
2 changes: 2 additions & 0 deletions src/GlueXSensitiveDetectorFMWPC.hh
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ class GlueXSensitiveDetectorFMWPC : public G4VSensitiveDetector
static int MAX_HITS;
static double TWO_HIT_TIME_RESOL;
static double THRESH_KEV;
static double WIRE_OFFSET;
static double WIRE_PITCH;

static int instanceCount;
static G4Mutex fMutex;
Expand Down

0 comments on commit ab6e38b

Please sign in to comment.