From 999a0899ec97179cc95b97389f6628da82f3ff74 Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <saw@jlab.org>
Date: Tue, 26 Sep 2017 12:39:32 -0400
Subject: [PATCH] Remove unused references to shower and cherenkov in
THcHodoscope
---
src/THcHodoscope.cxx | 37 +------------------------------------
src/THcHodoscope.h | 5 -----
2 files changed, 1 insertion(+), 41 deletions(-)
diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx
index aed843f..8d0fc57 100644
--- a/src/THcHodoscope.cxx
+++ b/src/THcHodoscope.cxx
@@ -125,43 +125,8 @@ void THcHodoscope::Setup(const char* name, const char* description)
cout << "Created Scintillator Plane " << fPlaneNames[i] << ", " << desc << endl;
}
- // --------------- To get energy from THcShower ----------------------
- const char* shower_detector_name = "cal";
- // THaApparatus* app;
- THcHallCSpectrometer *app = dynamic_cast<THcHallCSpectrometer*>(GetApparatus());
- THaDetector* det = app->GetDetector( shower_detector_name );
-
- if( dynamic_cast<THcShower*>(det) ) {
- fShower = dynamic_cast<THcShower*>(det);
- }
- else if( !dynamic_cast<THcShower*>(det) ) {
- cout << "Warining: calorimeter analysis module "
- << shower_detector_name << " not loaded for spectrometer "
- << prefix << endl;
-
- fShower = NULL;
- }
-
- // --------------- To get energy from THcShower ----------------------
-
- // --------------- To get NPEs from THcCherenkov -------------------
-
- const char* chern_detector_name = "cer";
- THaDetector* detc = app->GetDetector( chern_detector_name );
-
- if( dynamic_cast<THcCherenkov*>(detc) ) {
- fChern = dynamic_cast<THcCherenkov*>(detc);
- }
- else if( !dynamic_cast<THcCherenkov*>(detc) ) {
- cout << "Warning: Cherenkov detector analysis module "
- << chern_detector_name << " not loaded for spectrometer "
- << prefix << endl;
-
- fChern = NULL;
- }
-
-
// Save the nominal particle mass
+ THcHallCSpectrometer *app = dynamic_cast<THcHallCSpectrometer*>(GetApparatus());
fPartMass = app->GetParticleMass();
fBetaNominal = app->GetBetaAtPcentral();
diff --git a/src/THcHodoscope.h b/src/THcHodoscope.h
index 14247f6..fdb8767 100644
--- a/src/THcHodoscope.h
+++ b/src/THcHodoscope.h
@@ -15,8 +15,6 @@
#include "THcHodoHit.h"
#include "THcRawHodoHit.h"
#include "THcScintillatorPlane.h"
-#include "THcShower.h"
-#include "THcCherenkov.h"
#include "THaTrackingDetector.h"
#include "THcHitList.h"
@@ -181,9 +179,6 @@ protected:
//-------------------------- Ahmed -----------------------------
- THcShower* fShower;
- THcCherenkov* fChern;
-
Int_t fCheckEvent;
Int_t fEventType;
--
GitLab