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

Fix some places where the workaround for missing ConstructedAt method

for older ROOT version wasn't working.
parent 1f303673
No related branches found
No related tags found
No related merge requests found
......@@ -13,6 +13,7 @@
#include "THcParmList.h"
#include "THcHitList.h"
#include "THcDriftChamber.h"
#include "TClass.h"
#include <cstring>
#include <cstdio>
......@@ -32,6 +33,9 @@ THcDriftChamberPlane::THcDriftChamberPlane( const char* name,
{
// Normal constructor with name and description
fTDCHits = new TClonesArray("THcSignalHit",100);
#if ROOT_VERSION_CODE < ROOT_VERSION(5,32,0)
fTDCHitsClass = fTDCHits->GetClass();
#endif
fPlaneNum = planenum;
}
......
......@@ -44,6 +44,8 @@ class THcDriftChamberPlane : public THaSubDetector {
TClonesArray* fTDCHits;
TClass* fTDCHitsClass;
Int_t fPlaneNum;
virtual Int_t ReadDatabase( const TDatime& date );
......
......@@ -185,7 +185,7 @@ if(hit->fADC_pos > 0) {
THcSignalHit *sighit = (THcSignalHit*) fPosADCHits->ConstructedAt(nPosADCHits++);
sighit->Set(hit->fCounter, hit->fADC_pos);
#else
TObject* obj = (*fPosTDCHits)[nPosADCHits++];
TObject* obj = (*fPosADCHits)[nPosADCHits++];
R__ASSERT( obj );
if(!obj->TestBit (TObject::kNotDeleted))
fPosADCHitsClass->New(obj);
......@@ -199,7 +199,7 @@ if(hit->fADC_neg > 0) {
THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++);
sighit->Set(hit->fCounter, hit->fADC_neg);
#else
TObject* obj = (*fPosTDCHits)[nNegADCHits++];
TObject* obj = (*fPosADCHits)[nNegADCHits++];
R__ASSERT( obj );
if(!obj->TestBit (TObject::kNotDeleted))
fNegADCHitsClass->New(obj);
......
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