Make gHcDetectorMap global available

src/THcDetectorMap.cxx

@@ -42,9 +42,9 @@ THcDetectorMap::~THcDetectorMap()
 {
 }
 
-//bool THcDetectorMap::compare(const ChaninMod *first, const ChaninMod *second) {
-//      return((first->channel < second->channel)? true: false);
-//}
+bool THcDetectorMap::compare(const ChaninMod *first, const ChaninMod *second) {
+      return((first->channel < second->channel)? true: false);
+}
 struct Functor
 {
   bool operator() (const THcDetectorMap::ChaninMod &first, const THcDetectorMap::ChaninMod &second)

src/THcGlobals.h

@@ -6,8 +6,9 @@
 #include "DllImport.h"
 #endif
 
-// Global Analyzer variables. Defined in THaInterface implementation file.
+// Global Analyzer variables. Defined in THcInterface implementation file.
 
 R__EXTERN class THcParmList*  gHcParms;      //List of global symbolic variables
+R__EXTERN class THcDetectorMap*  gHcDetectorMap;   //Cached map file
 
 #endif

src/THcHodoscope.cxx

@@ -10,6 +10,8 @@
 #include "THcHodoscope.h"
 #include "THaEvData.h"
 #include "THaDetMap.h"
+#include "THcDetectorMap.h"
+#include "THcGlobals.h"
 #include "VarDef.h"
 #include "VarType.h"
 #include "THaTrack.h"
@@ -69,7 +71,7 @@ THaAnalysisObject::EStatus THcHodoscope::Init( const TDatime& date )
   // maximum number of hits after setting up the detector map
 
   THcHitList::InitHitList(fDetMap, "THcHodoscopeHit", 100);
-  if( gHcDetectorMap->FillMap("detectorname",fDetMap) < 0 ) {
+  if( gHcDetectorMap->FillMap(fDetMap, "detectorname") < 0 ) {
       Error( Here(here), "Error filling detectormap for %s.", 
 	     "detectorname");
       return kInitError;