From 9b1d1b4cb762c235afc8a3e9cdd72cfd4f05d80f Mon Sep 17 00:00:00 2001
From: Vardan Tadevosyan <tadevosn@jlab.org>
Date: Thu, 10 Oct 2013 16:13:43 -0400
Subject: [PATCH] Minor amendments in the HMS calorimeter part.
Changed column and row numbering in THcShowerHit.h in order to get rid of
warning messages on unsigned and integer comaprisons when compiling;
Corrected a debug message in THcShower.cxx.
---
examples/hodtest_mkj.C | 2 +-
podd | 2 +-
src/THcShower.cxx | 7 +++++--
src/THcShowerHit.h | 8 ++++----
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/examples/hodtest_mkj.C b/examples/hodtest_mkj.C
index 732a4ac..f091dbf 100644
--- a/examples/hodtest_mkj.C
+++ b/examples/hodtest_mkj.C
@@ -8,7 +8,7 @@ void hodtest_mkj(Int_t RunNumber=50017, Int_t MaxEventToReplay=5000) {
char* RunFileNamePattern="daq04_%d.log.0";
} else {
// char* RunFileNamePattern="/cache/mss/hallc/daq04/raw/daq04_%d.log.0";
- char* RunFileNamePattern="/scratch/tadevosn/daq04_%d.log.0";
+ char* RunFileNamePattern="daq04_%d.log.0";
}
gHcParms->Define("gen_run_number", "Run Number", RunNumber);
gHcParms->AddString("g_ctp_database_filename", "DBASE/test.database");
diff --git a/podd b/podd
index 6dc6a0d..5dbaea9 160000
--- a/podd
+++ b/podd
@@ -1 +1 @@
-Subproject commit 6dc6a0d2995aa24855eaa4f07f7767ed7486be6f
+Subproject commit 5dbaea975ff82d567c1ec4ef866634dc97bb55b3
diff --git a/src/THcShower.cxx b/src/THcShower.cxx
index 167807d..e53a9e3 100644
--- a/src/THcShower.cxx
+++ b/src/THcShower.cxx
@@ -707,7 +707,9 @@ Int_t THcShower::CoarseProcess( TClonesArray& tracks)
//Print out the cluster list.
//
- if (fdbg_clusters_cal) cout << "Cluster_list size: " << fNclust << endl;
+ if (fdbg_clusters_cal) {
+
+ cout << "Cluster_list size: " << fNclust << endl;
for (Int_t i=0; i!=fNclust; i++) {
@@ -726,7 +728,8 @@ Int_t THcShower::CoarseProcess( TClonesArray& tracks)
cout << " hit #" << j << ": "; (*hit).show();
}
- }
+ }
+ }
//The largest cluster.
diff --git a/src/THcShowerHit.h b/src/THcShowerHit.h
index 76f70d9..df7e98f 100644
--- a/src/THcShowerHit.h
+++ b/src/THcShowerHit.h
@@ -12,7 +12,7 @@ using namespace std;
class THcShowerHit { //HMS calorimeter hit class
private:
- UInt_t fCol, fRow; //hit colomn and row
+ Int_t fCol, fRow; //hit colomn and row
Double_t fX, fZ; //hit X (vert.) and Z (along spect.axis) coordinates
Double_t fE; //hit mean energy deposition
Double_t fEpos; //hit energy deposition from positive PMT
@@ -28,7 +28,7 @@ public:
fEneg=0.;
}
- THcShowerHit(UInt_t hRow, UInt_t hCol, Double_t hX, Double_t hZ,
+ THcShowerHit(Int_t hRow, Int_t hCol, Double_t hX, Double_t hZ,
Double_t hE, Double_t hEpos, Double_t hEneg) {
fRow=hRow;
fCol=hCol;
@@ -43,11 +43,11 @@ public:
// cout << " hit destructed" << endl;
}
- UInt_t hitColumn() {
+ Int_t hitColumn() {
return fCol;
}
- UInt_t hitRow() {
+ Int_t hitRow() {
return fRow;
}
--
GitLab