Skip to content
Snippets Groups Projects
Commit 760f7563 authored by Simon Zhamkochyan's avatar Simon Zhamkochyan
Browse files

Fixed corrupted THcScintilatorPlane.cxx

parent 9c37c812
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/THcScintillatorPlane.cxx
+ 8
− 93
View file @ 760f7563
...@@ -216,8 +216,8 @@ if(hit->fTDC_pos > 0) { ...@@ -216,8 +216,8 @@ if(hit->fTDC_pos > 0) {
THcSignalHit *sighit = (THcSignalHit*) fPosTDCHits->ConstructedAt(nPosTDCHits++); THcSignalHit *sighit = (THcSignalHit*) fPosTDCHits->ConstructedAt(nPosTDCHits++);
sighit->Set(hit->fCounter, hit->fTDC_pos); sighit->Set(hit->fCounter, hit->fTDC_pos);
#else #else
TObjrct* obj = (*fPoaTDCHits)[nPosTDCHits++]; TObject* obj = (*fPosTDCHits)[nPosTDCHits++];
R_ASSERT( obj ); R__ASSERT( obj );
if(!obj->TestBit (TObject::kNotDeleted)) if(!obj->TestBit (TObject::kNotDeleted))
fPosTDCHitsClass->New(obj); fPosTDCHitsClass->New(obj);
THcSignalHit *sighit = (THcSignalHit*)obj; THcSignalHit *sighit = (THcSignalHit*)obj;
...@@ -231,8 +231,8 @@ if(hit->fTDC_neg > 0) { ...@@ -231,8 +231,8 @@ if(hit->fTDC_neg > 0) {
THcSignalHit *sighit = (THcSignalHit*) fNegTDCHits->ConstructedAt(nNegTDCHits++); THcSignalHit *sighit = (THcSignalHit*) fNegTDCHits->ConstructedAt(nNegTDCHits++);
sighit->Set(hit->fCounter, hit->fTDC_neg); sighit->Set(hit->fCounter, hit->fTDC_neg);
#else #else
TObjrct* obj = (*fPoaTDCHits)[nNegTDCHits++]; TObject* obj = (*fPosTDCHits)[nNegTDCHits++];
R_ASSERT( obj ); R__ASSERT( obj );
if(!obj->TestBit (TObject::kNotDeleted)) if(!obj->TestBit (TObject::kNotDeleted))
fNegTDCHitsClass->New(obj); fNegTDCHitsClass->New(obj);
THcSignalHit *sighit = (THcSignalHit*)obj; THcSignalHit *sighit = (THcSignalHit*)obj;
...@@ -245,8 +245,8 @@ if(hit->fADC_pos > 0) { ...@@ -245,8 +245,8 @@ if(hit->fADC_pos > 0) {
THcSignalHit *sighit = (THcSignalHit*) fPosADCHits->ConstructedAt(nPosADCHits++); THcSignalHit *sighit = (THcSignalHit*) fPosADCHits->ConstructedAt(nPosADCHits++);
sighit->Set(hit->fCounter, hit->fADC_pos); sighit->Set(hit->fCounter, hit->fADC_pos);
#else #else
TObjrct* obj = (*fPoaTDCHits)[nPosADCHits++]; TObject* obj = (*fPosTDCHits)[nPosADCHits++];
R_ASSERT( obj ); R__ASSERT( obj );
if(!obj->TestBit (TObject::kNotDeleted)) if(!obj->TestBit (TObject::kNotDeleted))
fPosADCHitsClass->New(obj); fPosADCHitsClass->New(obj);
THcSignalHit *sighit = (THcSignalHit*)obj; THcSignalHit *sighit = (THcSignalHit*)obj;
...@@ -259,8 +259,8 @@ if(hit->fADC_neg > 0) { ...@@ -259,8 +259,8 @@ if(hit->fADC_neg > 0) {
THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++); THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++);
sighit->Set(hit->fCounter, hit->fADC_neg); sighit->Set(hit->fCounter, hit->fADC_neg);
#else #else
TObjrct* obj = (*fPoaTDCHits)[nNegADCHits++]; TObject* obj = (*fPosTDCHits)[nNegADCHits++];
R_ASSERT( obj ); R__ASSERT( obj );
if(!obj->TestBit (TObject::kNotDeleted)) if(!obj->TestBit (TObject::kNotDeleted))
fNegADCHitsClass->New(obj); fNegADCHitsClass->New(obj);
THcSignalHit *sighit = (THcSignalHit*)obj; THcSignalHit *sighit = (THcSignalHit*)obj;
...@@ -268,91 +268,6 @@ if(!obj->TestBit (TObject::kNotDeleted)) ...@@ -268,91 +268,6 @@ if(!obj->TestBit (TObject::kNotDeleted))
sighit->Set(hit->fCounter, hit->fADC_neg); sighit->Set(hit->fCounter, hit->fADC_neg);
} }
/*
if(hit->fTDC_pos > 0) {
#if ROOT_VERSION_CODE >= ROOT_VERSION(5,32,0)
THcSignalHit *sighit = (THcSignalHit*) fPosTDCHits->ConstructedAt(nPosTDCHits++);
sighit->Set(hit->fCounter, hit->fTDC_pos);
#else
// The essence of the ConstructedAt code explictly
TObject* obj = (*fPosTDCHits)[nPosTDCHits++];
R__ASSERT( obj ); // should never happen ...
if( !obj->TestBit(TObject::kNotDeleted) )
fPosTDCHitsClass->New(obj);
THcSignalHit *sighit = (THcSignalHit*) obj;
#endif
sighit->Set(hit->fCounter, hit->fTDC_pos);
}
*/
/*
if(hit->fTDC_neg > 0) {
#if ROOT_VERSION_CODE >= ROOT_VERSION(5,32,0)
THcSignalHit *sighit = (THcSignalHit*) fNegTDCHits->ConstructedAt(nNegTDCHits++);
sighit->Set(hit->fCounter, hit->fTDC_neg);
#else
// The essence of the ConstructedAt code explictly
TObject* obj = (*fNegTDCHits)[nNegTDCHits++];
R__ASSERT( obj ); // should never happen ...
if( !obj->TestBit(TObject::kNotDeleted) )
fNegTDCHitsClass->New(obj);
THcSignalHit *sighit = (THcSignalHit*) obj;
#endif
sighit->Set(hit->fCounter, hit->fTDC_neg);
}
if(hit->fADC_pos > 0) {
#if ROOT_VERSION_CODE >= ROOT_VERSION(5,32,0)
THcSignalHit *sighit = (THcSignalHit*) fNegTDCHits->ConstructedAt(nPosADCHits++);
sighit->Set(hit->fCounter, hit->fADC_pos);
#else
// The essence of the ConstructedAt code explictly
TObject* obj = (*fPosADCHits)[nPosADCHits++];
R__ASSERT( obj ); // should never happen ...
if( !obj->TestBit(TObject::kNotDeleted) )
fPosADCHitsClass->New(obj);
THcSignalHit *sighit = (THcSignalHit*) obj;
#endif
sighit->Set(hit->fCounter, hit->fADC_pos);
}
if(hit->fADC_neg > 0) {
#if ROOT_VERSION_CODE >= ROOT_VERSION(5,32,0)
THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++);
sighit->Set(hit->fCounter, hit->fTDC_neg);
#else
// The essence of the ConstructedAt code explictly
TObject* obj = (*fNegADCHits)[nNegADCHits++];
R__ASSERT( obj ); // should never happen ...
if( !obj->TestBit(TObject::kNotDeleted) )
fNegADCHitsClass->New(obj);
THcSignalHit *sighit = (THcSignalHit*) obj;
#endif
sighit->Set(hit->fCounter, hit->fADC_neg);
}
*/
/*
if(hit->fTDC_pos > 0) {
THcSignalHit *sighit = (THcSignalHit*) fPosTDCHits->ConstructedAt(nPosTDCHits++);
sighit->Set(hit->fCounter, hit->fTDC_pos);
}
if(hit->fTDC_neg > 0) {
THcSignalHit *sighit = (THcSignalHit*) fNegTDCHits->ConstructedAt(nNegTDCHits++);
sighit->Set(hit->fCounter, hit->fTDC_neg);
}
if(hit->fADC_pos > 0) {
THcSignalHit *sighit = (THcSignalHit*) fPosADCHits->ConstructedAt(nPosADCHits++);
sighit->Set(hit->fCounter, hit->fADC_pos);
}
if(hit->fADC_neg > 0) {
THcSignalHit *sighit = (THcSignalHit*) fNegADCHits->ConstructedAt(nNegADCHits++);
sighit->Set(hit->fCounter, hit->fADC_neg);
}
*/
ihit++; ihit++;
} }
return(ihit); return(ihit);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment