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

Attempt to fix TClonesArray issues with root <5.32 and podd fix for root>=5.34

parent 94e94abd
No related branches found
No related tags found
No related merge requests found
Subproject commit fe3e7463fe6e531dd790cf5ea103a368e4b17b7a Subproject commit 8c65357a0b8bf6f25064fe1ffda5241085b5a332
...@@ -39,6 +39,7 @@ THcDriftChamber::THcDriftChamber( ...@@ -39,6 +39,7 @@ THcDriftChamber::THcDriftChamber(
// Constructor // Constructor
// fTrackProj = new TClonesArray( "THaTrackProj", 5 ); // fTrackProj = new TClonesArray( "THaTrackProj", 5 );
fNPlanes = 0; // No planes until we make them
} }
......
...@@ -162,7 +162,7 @@ Int_t THcDriftChamberPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit) ...@@ -162,7 +162,7 @@ Int_t THcDriftChamberPlane::ProcessHits(TClonesArray* rawhits, Int_t nexthit)
if(!obj->TestBit (TObject::kNotDeleted)) if(!obj->TestBit (TObject::kNotDeleted))
fTDCHitsClass->New(obj); fTDCHitsClass->New(obj);
THcSignalHit *sighit = (THcSignalHit*)obj; THcSignalHit *sighit = (THcSignalHit*)obj;
#endif #endif
sighit->Set(hit->fCounter, hit->fTDC[0]); sighit->Set(hit->fCounter, hit->fTDC[0]);
} }
ihit++; ihit++;
......
...@@ -54,7 +54,7 @@ void THcHitList::InitHitList(THaDetMap* detmap, ...@@ -54,7 +54,7 @@ void THcHitList::InitHitList(THaDetMap* detmap,
Int_t THcHitList::DecodeToHitList( const THaEvData& evdata ) { Int_t THcHitList::DecodeToHitList( const THaEvData& evdata ) {
THcRawHit* rawhit; THcRawHit* rawhit;
// cout << " Clearing TClonesArray " << endl; // cout << " Clearing TClonesArray " << endl;
fRawHitList->Clear("C"); fRawHitList->Clear( );
fNRawHits = 0; fNRawHits = 0;
for ( Int_t i=0; i < fdMap->GetSize(); i++ ) { for ( Int_t i=0; i < fdMap->GetSize(); i++ ) {
...@@ -89,6 +89,7 @@ Int_t THcHitList::DecodeToHitList( const THaEvData& evdata ) { ...@@ -89,6 +89,7 @@ Int_t THcHitList::DecodeToHitList( const THaEvData& evdata ) {
if(thishit == fNRawHits) { if(thishit == fNRawHits) {
rawhit = (THcRawHit*) (*fRawHitList)[thishit]; rawhit = (THcRawHit*) (*fRawHitList)[thishit];
rawhit->Clear(); // Blank out hit contents
fNRawHits++; fNRawHits++;
rawhit->fPlane = plane; rawhit->fPlane = plane;
rawhit->fCounter = counter; rawhit->fCounter = counter;
......
...@@ -39,6 +39,7 @@ THcHodoscope::THcHodoscope( const char* name, const char* description, ...@@ -39,6 +39,7 @@ THcHodoscope::THcHodoscope( const char* name, const char* description,
//fTrackProj = new TClonesArray( "THaTrackProj", 5 ); //fTrackProj = new TClonesArray( "THaTrackProj", 5 );
// Construct the planes // Construct the planes
fNPlanes = 0; // No planes until we make them
} }
...@@ -57,7 +58,7 @@ void THcHodoscope::Setup(const char* name, const char* description) ...@@ -57,7 +58,7 @@ void THcHodoscope::Setup(const char* name, const char* description)
static const char* const message = static const char* const message =
"Must construct %s detector with valid name! Object construction failed."; "Must construct %s detector with valid name! Object construction failed.";
cout << "In THcHodoscope::Init()" << endl; cout << "In THcHodoscope::Setup()" << endl;
// Base class constructor failed? // Base class constructor failed?
if( IsZombie()) return; if( IsZombie()) return;
......
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