From 3ee257c37ed95deaf10b97918dca5e50b15be9fa Mon Sep 17 00:00:00 2001 From: KAWASE Shoichiro Date: Mon, 14 Oct 2013 18:30:15 +0900 Subject: [PATCH] rename TPlasticMappingProcessor to TTimingChargeMappingProcessor --- ...or.cc => TTimingChargeMappingProcessor.cc} | 26 +++++++++---------- ...ssor.h => TTimingChargeMappingProcessor.h} | 22 ++++++++-------- processors/linkdef_user.h | 4 +-- processors/makefile | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) rename processors/{TPlasticMappingProcessor.cc => TTimingChargeMappingProcessor.cc} (89%) rename processors/{TPlasticMappingProcessor.h => TTimingChargeMappingProcessor.h} (72%) diff --git a/processors/TPlasticMappingProcessor.cc b/processors/TTimingChargeMappingProcessor.cc similarity index 89% rename from processors/TPlasticMappingProcessor.cc rename to processors/TTimingChargeMappingProcessor.cc index 8780c94..2f5aaf5 100644 --- a/processors/TPlasticMappingProcessor.cc +++ b/processors/TTimingChargeMappingProcessor.cc @@ -1,27 +1,27 @@ /** - * @file TPlasticMappingProcessor.cc + * @file TTimingChargeMappingProcessor.cc * @brief * * @date Created: 2013-08-12 12:45:58 - * Last Modified: 2013-10-14 17:23:07 + * Last Modified: 2013-10-14 18:27:35 * @author KAWASE Shoichiro * * Copyright (C) 2013 KAWASE Shoichiro All rights reserved. */ -#include "TPlasticMappingProcessor.h" +#include "TTimingChargeMappingProcessor.h" #include "TTimingChargeData.h" #include "TConverterBase.h" #include #include -using art::TPlasticMappingProcessor; +using art::TTimingChargeMappingProcessor; using art::TTimingChargeData; using art::TConverterBase; // Default constructor -TPlasticMappingProcessor::TPlasticMappingProcessor() +TTimingChargeMappingProcessor::TTimingChargeMappingProcessor() : fPlastic(NULL), fDoTimingConversion(kTRUE), fDoChargeConversion(kTRUE), fTimingConversionPrm(NULL), fChargeConversionPrm(NULL) { @@ -47,15 +47,15 @@ TPlasticMappingProcessor::TPlasticMappingProcessor() } // Default destructor -TPlasticMappingProcessor::~TPlasticMappingProcessor() { +TTimingChargeMappingProcessor::~TTimingChargeMappingProcessor() { if(fPlastic) delete fPlastic; fPlastic = NULL; if (fTimingConversionPrm) delete fTimingConversionPrm; if (fChargeConversionPrm) delete fChargeConversionPrm; } -void TPlasticMappingProcessor::Init(TEventCollection *col) { - printf("art::TPlasticMappingProcessor::Init()\n"); +void TTimingChargeMappingProcessor::Init(TEventCollection *col) { + printf("art::TTimingChargeMappingProcessor::Init()\n"); fCategorizedData = reinterpret_cast(col->Get(fInputColName.front())->GetObjectRef()); fPlastic = new TClonesArray("art::TTimingChargeData"); @@ -90,7 +90,7 @@ void TPlasticMappingProcessor::Init(TEventCollection *col) { printf("\n"); } -void TPlasticMappingProcessor::SetConversionPrm(std::vector *p, +void TTimingChargeMappingProcessor::SetConversionPrm(std::vector *p, TString &name, TEventCollection *col) { TEventObject *convPrm = col->Get(name); TClonesArray **fConversionArray = @@ -103,7 +103,7 @@ void TPlasticMappingProcessor::SetConversionPrm(std::vector *p, } } -void TPlasticMappingProcessor::Process() { +void TTimingChargeMappingProcessor::Process() { fPlastic->Clear("C"); @@ -143,7 +143,7 @@ void TPlasticMappingProcessor::Process() { } } -void TPlasticMappingProcessor::MapEdgedTime(TRefArray *tArray) +void TTimingChargeMappingProcessor::MapEdgedTime(TRefArray *tArray) { TTimingChargeData *data = NULL; TRawTimingWithEdge *hit = NULL; @@ -166,7 +166,7 @@ void TPlasticMappingProcessor::MapEdgedTime(TRefArray *tArray) // "Leading" edge data = static_cast(fPlastic->ConstructedAt(fPlastic->GetEntriesFast())); if (!data) { - printf("something strange happened in TPlasticMappingProc::MapEdgedTime\n"); + printf("something strange happened in TTimingChargeMappingProc::MapEdgedTime\n"); continue; } @@ -201,7 +201,7 @@ void TPlasticMappingProcessor::MapEdgedTime(TRefArray *tArray) } } -void TPlasticMappingProcessor::MapTimeCharge(TRefArray *tArray, TRefArray *qArray){ +void TTimingChargeMappingProcessor::MapTimeCharge(TRefArray *tArray, TRefArray *qArray){ if(!tArray) return; diff --git a/processors/TPlasticMappingProcessor.h b/processors/TTimingChargeMappingProcessor.h similarity index 72% rename from processors/TPlasticMappingProcessor.h rename to processors/TTimingChargeMappingProcessor.h index 33f7fb4..4c5b564 100644 --- a/processors/TPlasticMappingProcessor.h +++ b/processors/TTimingChargeMappingProcessor.h @@ -1,34 +1,34 @@ /** - * @file TPlasticMappingProcessor.h + * @file TTimingChargeMappingProcessor.h * @brief * * @date Created: 2013-08-12 12:36:40 - * Last Modified: 2013-10-14 17:22:30 + * Last Modified: 2013-10-14 18:28:15 * @author KAWASE Shoichiro * * Copyright (C) 2013 KAWASE Shoichiro All rights reserved */ -#ifndef TPLASTICMAPPINGPROCESSOR_H -#define TPLASTICMAPPINGPROCESSOR_H +#ifndef TTIMINGCHARGEMAPPINGPROCESSOR_H +#define TTIMINGCHARGEMAPPINGPROCESSOR_H #include namespace art{ - class TPlasticMappingProcessor; + class TTimingChargeMappingProcessor; class TCategorizedData; class TConverterBase; } class TRefArray; -class art::TPlasticMappingProcessor : public TProcessor { +class art::TTimingChargeMappingProcessor : public TProcessor { public: // Default constructor - TPlasticMappingProcessor(); + TTimingChargeMappingProcessor(); // Default destructor - virtual ~TPlasticMappingProcessor(); + virtual ~TTimingChargeMappingProcessor(); virtual void Init(TEventCollection *col); virtual void Process(); @@ -51,9 +51,9 @@ protected: private: // Copy constructor (prohibited) - TPlasticMappingProcessor(const TPlasticMappingProcessor& rhs); + TTimingChargeMappingProcessor(const TTimingChargeMappingProcessor& rhs); // Assignment operator (prohibited) - TPlasticMappingProcessor& operator=(const TPlasticMappingProcessor& rhs); + TTimingChargeMappingProcessor& operator=(const TTimingChargeMappingProcessor& rhs); void MapEdgedTime(TRefArray *tArray); void MapTimeCharge(TRefArray *tArray, TRefArray *qArray); @@ -63,4 +63,4 @@ private: }; -#endif // TPLASTICMAPPINGPROCESSOR_H +#endif // TTIMINGCHARGEMAPPINGPROCESSOR_H diff --git a/processors/linkdef_user.h b/processors/linkdef_user.h index 1e676f6..25d2a16 100644 --- a/processors/linkdef_user.h +++ b/processors/linkdef_user.h @@ -3,7 +3,7 @@ * @brief * * @date Created: 2013-08-12 14:48:07 - * Last Modified: 2013-10-14 15:36:28 + * Last Modified: 2013-10-14 18:28:54 * @author KAWASE Shoichiro * * Copyright (C) 2013 KAWASE Shoichiro All rights reserved @@ -19,7 +19,7 @@ #pragma link off all functions; #pragma link C++ class art::TTimingChargeData+; -#pragma link C++ class art::TPlasticMappingProcessor-!; +#pragma link C++ class art::TTimingChargeMappingProcessor-!; #pragma link C++ class art::TTwoSidedPlasticData+; #pragma link C++ class art::TTwoSidedPlasticCalibrationProcessor-!; #pragma link C++ class art::TConverterBase+; diff --git a/processors/makefile b/processors/makefile index db5ba63..c83decc 100644 --- a/processors/makefile +++ b/processors/makefile @@ -1,5 +1,5 @@ #CXX = g++ -OBJ = TPlasticMappingProcessor.o \ +OBJ = TTimingChargeMappingProcessor.o \ TTimingChargeData.o \ TTwoSidedPlasticData.o \ TTwoSidedPlasticCalibrationProcessor.o \ -- GitLab