diff --git a/src/cat/TCatAtHitPatternProcessor.cc b/src/cat/TCatAtHitPatternProcessor.cc index 3437b67404cdde2a4163e45479fc0812264bc1bb..b7cf4e2ec744b42500a617f6827f6a6ca51579eb 100644 --- a/src/cat/TCatAtHitPatternProcessor.cc +++ b/src/cat/TCatAtHitPatternProcessor.cc @@ -2,7 +2,7 @@ /** * @file TCatAtHitPatternProcessor.cc * @date Created : Feb 10, 2013 10:10:17 JST - * Last Modified : 2017-12-25 21:32:19 JST (ota) + * Last Modified : 2018-02-24 20:14:16 JST (ota) * @author Shinsuke OTA * * @@ -28,6 +28,7 @@ art::TCatAtHitPatternProcessor::TCatAtHitPatternProcessor() { fPads = NULL; fCanvas = NULL; + fText = NULL; StringVec_t defInput; defInput.push_back("atraw"); RegisterInputCollection("InputCollection","flash adc raw data", @@ -46,7 +47,7 @@ art::TCatAtHitPatternProcessor::TCatAtHitPatternProcessor() } art::TCatAtHitPatternProcessor::~TCatAtHitPatternProcessor() { - delete fText; + if (fText) delete fText; if (fCanvas) delete fCanvas; } diff --git a/src/cat/TCatAtMappingProcessor.cc b/src/cat/TCatAtMappingProcessor.cc index e8f9bc4c013db4a3b1eae218da9f86c62f3f8946..c713b3cf560e8cdb79516c1f69ff5f62023807f6 100644 --- a/src/cat/TCatAtMappingProcessor.cc +++ b/src/cat/TCatAtMappingProcessor.cc @@ -2,7 +2,7 @@ /** * @file TCatAtMappingProcessor.cc * @date Created : Feb 06, 2013 14:06:38 JST - * Last Modified : 2017-12-24 17:49:43 JST (ota) + * Last Modified : 2018-02-05 09:59:55 JST (ota) * @author Shinsuke OTA * * @@ -94,6 +94,7 @@ void art::TCatAtMappingProcessor::Process() TCatPulseShape *hit = (TCatPulseShape*) fCATHit->ConstructedAt(fCATHit->GetEntriesFast()); hit->SetID(hitorg->GetDetID()); + hit->SetAuxID(hitorg->GetUniqueID()); hit->SetTime(hitorg->GetTimestamp()); hit->SetGeo(hitorg->GetGeo()); hit->SetCh(hitorg->GetCh());