Skip to content
Snippets Groups Projects
Commit e6bcb23f authored by Stephen A. Wood's avatar Stephen A. Wood
Browse files

.h file cleanup. Fix indentation, remove some commented lines.

parent 1f4c4735
No related branches found
No related tags found
No related merge requests found
......@@ -16,13 +16,13 @@
class THcDCHit : public TObject {
public:
THcDCHit( THcDCWire* wire=NULL, Int_t rawtime=0, Double_t time=0.0,
THcDriftChamberPlane* wp=0) :
fWire(wire), fRawTime(rawtime), fTime(time), fWirePlane(wp),
THcDCHit( THcDCWire* wire=NULL, Int_t rawtime=0, Double_t time=0.0,
THcDriftChamberPlane* wp=0) :
fWire(wire), fRawTime(rawtime), fTime(time), fWirePlane(wp),
fDist(0.0), ftrDist(kBig) {
ConvertTimeToDist();
fCorrected = 0;
}
ConvertTimeToDist();
fCorrected = 0;
}
virtual ~THcDCHit() {}
virtual Double_t ConvertTimeToDist();
......@@ -74,7 +74,7 @@ protected:
THcDriftChamber* fChamber; //! Pointer to parent wire plane
private:
private:
THcDCHit( const THcDCHit& );
THcDCHit& operator=( const THcDCHit& );
......
......@@ -13,8 +13,8 @@
class THcDCLookupTTDConv : public THcDCTimeToDistConv{
public:
THcDCLookupTTDConv(Double_t T0, Double_t MaxDriftDistance, Double_t BinSize,
Int_t NumBins, Double_t* Table);
THcDCLookupTTDConv(Double_t T0, Double_t MaxDriftDistance, Double_t BinSize,
Int_t NumBins, Double_t* Table);
virtual ~THcDCLookupTTDConv();
......
......@@ -56,34 +56,31 @@ public:
// TObject functions redefined
virtual void Clear( Option_t* opt="" );
protected:
Int_t fnSP; /* Number of space points in this track */
/* Should we have a list of pointers to space points
instead of their indices? */
// Int_t fspID[10]; /* List of space points in this track */
THcSpacePoint* fSp[10]; /* List of space points in this track */
protected:
Int_t fnSP; /* Number of space points in this track */
THcSpacePoint* fSp[10]; /* List of space points in this track */
Int_t fNHits;
Int_t fNfree; /* Number of degrees of freedom */
struct Hit {
// This is the same structure as in THcSpacePoint. Can we not
// duplicate this?
THcDCHit* dchit;
Double_t distCorr;
Int_t lr;
};
std::vector<Hit> fHits; /* List of hits for this track */
//std::vector<THcDCHit*> fHits; /* List of hits for this track */
std::vector<Double_t> fCoords; /* Coordinate on each plane */
std::vector<Double_t> fResiduals; /* Residual on each plane */
std::vector<Double_t> fDoubleResiduals; /* Residual on each plane for single stub mode */
Double_t fX_fp, fY_fp, fZ_fp;
Double_t fXp_fp, fYp_fp;
Double_t fChi2_fp;
virtual void AddHit(THcDCHit * hit, Double_t dist, Int_t lr);
private:
Int_t fNHits;
Int_t fNfree; /* Number of degrees of freedom */
struct Hit {
// This is the same structure as in THcSpacePoint. Can we not
// duplicate this?
THcDCHit* dchit;
Double_t distCorr;
Int_t lr;
};
std::vector<Hit> fHits; /* List of hits for this track */
//std::vector<THcDCHit*> fHits; /* List of hits for this track */
std::vector<Double_t> fCoords; /* Coordinate on each plane */
std::vector<Double_t> fResiduals; /* Residual on each plane */
std::vector<Double_t> fDoubleResiduals; /* Residual on each plane for single stub mode */
Double_t fX_fp, fY_fp, fZ_fp;
Double_t fXp_fp, fYp_fp;
Double_t fChi2_fp;
virtual void AddHit(THcDCHit * hit, Double_t dist, Int_t lr);
private:
// Hide copy ctor and op=
THcDCTrack( const THcDCTrack& );
THcDCTrack& operator=( const THcDCTrack& );
......
......@@ -15,7 +15,7 @@ class THcDCWire : public TObject {
public:
THcDCWire( Int_t num=0, Double_t pos=0.0, Double_t offset=0.0,
THcDCTimeToDistConv* ttd=NULL ) :
THcDCTimeToDistConv* ttd=NULL ) :
fNum(num), fFlag(0), fPos(pos), fTOffset(offset), fTTDConv(ttd) {}
virtual ~THcDCWire() {}
......
......@@ -115,21 +115,6 @@ protected:
Int_t* plusminus, Double_t* stub);
std::vector<THcDCHit*> fHits; /* All hits for this chamber */
// A simple structure until we figure out what we are doing.
#if 0
struct SpacePoint {
Double_t x;
Double_t y;
Int_t nhits;
Int_t ncombos;
// THcDCHit* hits[MAX_HITS_PER_POINT];
std::vector<THcDCHit*> hits;
Double_t stub[4];
void Clear(Option_t* opt="") {nhits=0;ncombos=0;hits.clear();};
SpacePoint() {nhits=0;ncombos=0;hits.clear();};
void SetXY(Double_t xa, Double_t ya) {x = xa; y = ya;};
};
#endif
TClonesArray *fSpacePoints;
Int_t fNSpacePoints;
Int_t fEasySpacePoint; /* This event is an easy space point */
......
......@@ -26,7 +26,7 @@ class THcHodoscope;
class THcDriftChamberPlane : public THaSubDetector {
public:
public:
THcDriftChamberPlane( const char* name, const char* description,
Int_t planenum, THaDetectorBase* parent = NULL);
virtual ~THcDriftChamberPlane();
......@@ -68,7 +68,7 @@ class THcDriftChamberPlane : public THaSubDetector {
Double_t* GetPlaneCoef() { return fPlaneCoef; }
THcDriftChamberPlane(); // for ROOT I/O
protected:
protected:
TClonesArray* fParentHitList;
......
......@@ -20,7 +20,7 @@ using namespace std;
class THcHitList {
public:
public:
virtual ~THcHitList();
......@@ -39,7 +39,7 @@ class THcHitList {
THaDetMap* fdMap;
protected:
protected:
ClassDef(THcHitList,0)
};
......
......@@ -7,9 +7,9 @@
class THcRawDCHit : public THcRawHit {
public:
public:
THcRawDCHit(Int_t plane=0, Int_t counter=0) : THcRawHit(plane, counter),
THcRawDCHit(Int_t plane=0, Int_t counter=0) : THcRawHit(plane, counter),
fNHits(0) {
}
THcRawDCHit& operator=( const THcRawDCHit& );
......@@ -27,9 +27,9 @@ class THcRawDCHit : public THcRawHit {
Int_t fNHits;
Int_t fTDC[MAXHITS];
protected:
protected:
private:
private:
ClassDef(THcRawDCHit, 0); // DC hit class
};
......
......@@ -14,8 +14,8 @@ class THcSpacePoint : public TObject {
public:
THcSpacePoint(Int_t nhits=0, Int_t ncombos=0) :
fNHits(nhits), fNCombos(ncombos) {
THcSpacePoint(Int_t nhits=0, Int_t ncombos=0) :
fNHits(nhits), fNCombos(ncombos) {
fHits.clear();
}
virtual ~THcSpacePoint() {}
......@@ -72,7 +72,7 @@ public:
// we need figure out how to avoid confusion between number and index.
Int_t fNChamber;
protected:
protected:
Double_t fX;
Double_t fY;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment