From 961e391ccea6a1da0075a307939df14856ffb03e Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <zviwood@gmail.com>
Date: Mon, 21 Jan 2013 11:59:00 -0500
Subject: [PATCH] New parameter file for "extra" parameters". Define
constants (e.g. plane counts) that are not defined in the ENGINE
parameter files so that the detector classes can be more generic.
Hodoscope and Aerogel now pick up plane and tube counts from this file
---
examples/PARAM/hcana.param | 10 ++++++++++
examples/hodtest.C | 4 ++++
src/THcAerogel.cxx | 12 ++++++++----
src/THcHodoscope.cxx | 21 ++++++++++++---------
4 files changed, 34 insertions(+), 13 deletions(-)
create mode 100644 examples/PARAM/hcana.param
diff --git a/examples/PARAM/hcana.param b/examples/PARAM/hcana.param
new file mode 100644
index 0000000..1adc39f
--- /dev/null
+++ b/examples/PARAM/hcana.param
@@ -0,0 +1,10 @@
+;
+; Parameters that were built into Fortran analyzer that we want
+; to pass as parameters so that the resulting code can be more generic.
+;
+
+hhodo_num_planes = 4
+
+hshower_num_layers = 4
+
+haero_num_pairs = 8
diff --git a/examples/hodtest.C b/examples/hodtest.C
index cc9a82e..4010df5 100644
--- a/examples/hodtest.C
+++ b/examples/hodtest.C
@@ -17,6 +17,10 @@
gHcParms->Load(gHcParms->GetString("g_ctp_parm_filename"));
+ // Constants not in ENGINE PARAM files that we want to be
+ // configurable
+ gHcParms->Load("PARAM/hcana.param");
+
// Generate db_cratemap to correspond to map file contents
char command[100];
sprintf(command,"./make_cratemap.pl < %s > db_cratemap.dat",gHcParms->GetString("g_decode_map_filename"));
diff --git a/src/THcAerogel.cxx b/src/THcAerogel.cxx
index 05c718b..4115297 100644
--- a/src/THcAerogel.cxx
+++ b/src/THcAerogel.cxx
@@ -87,15 +87,19 @@ Int_t THcAerogel::ReadDatabase( const TDatime& date )
// This function is called by THaDetectorBase::Init() once at the beginning
// of the analysis.
+ cout << "THcAerogel::ReadDatabase " << GetName() << endl;
+
char prefix[2];
- // Pull values from THcParmList instead
prefix[0]=tolower(GetApparatus()->GetName()[0]);
prefix[1]='\0';
- fNelem = 8;// Number of tube pairs // The ENGINE style parameter files don't define
- // this. Probably need an additional parameter file
- // that contains these fixed parameters.
+ DBRequest listextra[]={
+ {"aero_num_pairs", &fNelem, kInt},
+ {0}
+ };
+ fNelem = 8; // Default if not defined
+ gHcParms->LoadParmValues((DBRequest*)&listextra,prefix);
fPosGain = new Double_t[fNelem];
fNegGain = new Double_t[fNelem];
diff --git a/src/THcHodoscope.cxx b/src/THcHodoscope.cxx
index ac85bd8..2fc58e4 100644
--- a/src/THcHodoscope.cxx
+++ b/src/THcHodoscope.cxx
@@ -66,16 +66,19 @@ void THcHodoscope::Setup(const char* name, const char* description)
if( IsZombie()) return;
fDebug = 1; // Keep this at one while we're working on the code
- // reading the number of planes from a param list! Still kludgy but it works
- system("rm tmp.txt; cat PARAM/hhodo.param |grep hhodo_slop|wc -w>tmp.txt");
- ifstream tmpfile;
- tmpfile.open("tmp.txt");
- tmpfile >> fNPlanes;
- tmpfile.close();
- fNPlanes = fNPlanes-2;
- cout << "fNPlanes = " << fNPlanes << endl;
- // fNPlanes = 4; // Should get this from parameters -> Now we do! GN
+ char prefix[2];
+
+ prefix[0]=tolower(GetApparatus()->GetName()[0]);
+ prefix[1]='\0';
+
+ DBRequest listextra[]={
+ {"hodo_num_planes", &fNPlanes, kInt},
+ {0}
+ };
+ fNPlanes = 4; // Default if not defined
+ gHcParms->LoadParmValues((DBRequest*)&listextra,prefix);
+
// Plane names
fPlaneNames = new char* [fNPlanes];
for(Int_t i=0;i<fNPlanes;i++) {fPlaneNames[i] = new char[3];}
--
GitLab