Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
H
hcana
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
jlab
hallc
analyzer_software
hcana
Commits
737e09cd
Commit
737e09cd
authored
9 years ago
by
Stephen A. Wood
Browse files
Options
Downloads
Patches
Plain Diff
Update to use latest version of podd.
Makefile and THcInterface changes to reflect the changes in podd scaler code
parent
242b6ca8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
Makefile
+4
-5
4 additions, 5 deletions
Makefile
podd
+1
-1
1 addition, 1 deletion
podd
src/THcInterface.cxx
+3
-3
3 additions, 3 deletions
src/THcInterface.cxx
src/THcInterface.h
+1
-0
1 addition, 0 deletions
src/THcInterface.h
with
9 additions
and
9 deletions
Makefile
+
4
−
5
View file @
737e09cd
...
@@ -62,7 +62,7 @@ ifndef ANALYZER
...
@@ -62,7 +62,7 @@ ifndef ANALYZER
$(
error
$$
ANALYZER environment variable not defined
)
$(
error
$$
ANALYZER environment variable not defined
)
endif
endif
INCDIRS
=
$(
wildcard
$(
addprefix
$(
ANALYZER
)
/, include src hana_decode
hana_scaler
))
,
$(
shell
pwd
)
/src
INCDIRS
=
$(
wildcard
$(
addprefix
$(
ANALYZER
)
/, include src hana_decode
))
$(
shell
pwd
)
/src
#------------------------------------------------------------------------------
#------------------------------------------------------------------------------
# Check that root version is new enough (>= 5.32) by requiring
# Check that root version is new enough (>= 5.32) by requiring
...
@@ -172,12 +172,11 @@ all: $(USERLIB) hcana
...
@@ -172,12 +172,11 @@ all: $(USERLIB) hcana
LIBDIR
:=
$(
ANALYZER
)
LIBDIR
:=
$(
ANALYZER
)
LIBHALLA
:=
$(
LIBDIR
)
/libHallA.so
LIBHALLA
:=
$(
LIBDIR
)
/libHallA.so
LIBDC
:=
$(
LIBDIR
)
/libdc.so
LIBDC
:=
$(
LIBDIR
)
/libdc.so
LIBSCALER
:=
$(
LIBDIR
)
/libscaler.so
HALLALIBS
:=
-L
$(
LIBDIR
)
-lHallA
-ldc
HALLALIBS
:=
-L
$(
LIBDIR
)
-lHallA
-ldc
-lscaler
src/THcInterface.d
:
$(HDR_COMPILEDATA)
src/THcInterface.d
:
$(HDR_COMPILEDATA)
hcana
:
src/main.o $(LIBDC)
$(LIBSCALER)
$(LIBHALLA) $(USERLIB)
hcana
:
src/main.o $(LIBDC) $(LIBHALLA) $(USERLIB)
$(
LD
)
$(
LDFLAGS
)
$<
$(
HALLALIBS
)
-L
.
-lHallC
$(
CCDBLIBS
)
\
$(
LD
)
$(
LDFLAGS
)
$<
$(
HALLALIBS
)
-L
.
-lHallC
$(
CCDBLIBS
)
\
$(
GLIBS
)
-o
$@
$(
GLIBS
)
-o
$@
...
@@ -185,7 +184,7 @@ $(USERLIB): $(HDR) $(OBJS)
...
@@ -185,7 +184,7 @@ $(USERLIB): $(HDR) $(OBJS)
$(
LD
)
$(
LDFLAGS
)
$(
SOFLAGS
)
-o
$@
$(
OBJS
)
$(
LD
)
$(
LDFLAGS
)
$(
SOFLAGS
)
-o
$@
$(
OBJS
)
@
echo
"
$@
done"
@
echo
"
$@
done"
$(HDR_COMPILEDATA) $(LIBHALLA) $(LIBDC)
$(LIBSCALER)
:
$(ANALYZER)/Makefile
$(HDR_COMPILEDATA) $(LIBHALLA) $(LIBDC)
:
$(ANALYZER)/Makefile
@
echo
"Building Podd"
@
echo
"Building Podd"
@
cd
$(
ANALYZER
)
;
export
PODD_EXTRA_DEFINES
=
-DHALLC_MODS
;
make
@
cd
$(
ANALYZER
)
;
export
PODD_EXTRA_DEFINES
=
-DHALLC_MODS
;
make
...
...
This diff is collapsed.
Click to expand it.
podd
@
e8e7648a
Compare
afce4df3
...
e8e7648a
Subproject commit
afce4df317bf88ff161519ee1ee94bd9eb85744f
Subproject commit
e8e7648acdaa65a8e8410a70e4b3be1089bb8e7c
This diff is collapsed.
Click to expand it.
src/THcInterface.cxx
+
3
−
3
View file @
737e09cd
...
@@ -78,8 +78,8 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv,
...
@@ -78,8 +78,8 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv,
gHcParms
=
new
THcParmList
;
gHcParms
=
new
THcParmList
;
gHaCuts
=
new
THaCutList
(
gHaVars
);
gHaCuts
=
new
THaCutList
(
gHaVars
);
gHaApps
=
new
TList
;
gHaApps
=
new
TList
;
gHaScalers
=
new
TList
;
gHaPhysics
=
new
TList
;
gHaPhysics
=
new
TList
;
gHaEvtHandlers
=
new
TList
;
// Use the standard CODA file decoder by default
// Use the standard CODA file decoder by default
gHaDecoder
=
Decoder
::
CodaDecoder
::
Class
();
gHaDecoder
=
Decoder
::
CodaDecoder
::
Class
();
// File-based database by default
// File-based database by default
...
@@ -110,7 +110,7 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv,
...
@@ -110,7 +110,7 @@ THcInterface::THcInterface( const char* appClassName, int* argc, char** argv,
gSystem
->
FreeDirectory
(
dp
);
gSystem
->
FreeDirectory
(
dp
);
s
=
p
;
s
=
p
;
}
else
}
else
s
=
s
+
"/src "
+
s
+
"/hana_decode "
+
s
+
"/hana_scaler"
;
s
=
s
+
"/src "
+
s
+
"/hana_decode "
;
}
}
// Directories names separated by blanks.
// Directories names separated by blanks.
// FIXME: allow blanks
// FIXME: allow blanks
...
@@ -160,7 +160,7 @@ THcInterface::~THcInterface()
...
@@ -160,7 +160,7 @@ THcInterface::~THcInterface()
delete
gHaTextvars
;
gHaTextvars
=
0
;
delete
gHaTextvars
;
gHaTextvars
=
0
;
// delete gHaDB; gHaDB = 0;
// delete gHaDB; gHaDB = 0;
delete
gHaPhysics
;
gHaPhysics
=
0
;
delete
gHaPhysics
;
gHaPhysics
=
0
;
delete
gHa
Sca
lers
;
gHa
Sca
lers
=
0
;
delete
gHa
EvtHand
lers
;
gHa
EvtHand
lers
=
0
;
delete
gHaApps
;
gHaApps
=
0
;
delete
gHaApps
;
gHaApps
=
0
;
delete
gHaVars
;
gHaVars
=
0
;
delete
gHaVars
;
gHaVars
=
0
;
delete
gHaCuts
;
gHaCuts
=
0
;
delete
gHaCuts
;
gHaCuts
=
0
;
...
...
This diff is collapsed.
Click to expand it.
src/THcInterface.h
+
1
−
0
View file @
737e09cd
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
//////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////////////////////////////////
#include
"TRint.h"
#include
"TRint.h"
#include
"Decoder.h"
class
TClass
;
class
TClass
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment