Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Analyzer_new
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
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
Whitney Armstrong
Analyzer_new
Commits
7dd19f86
Commit
7dd19f86
authored
12 years ago
by
Whitney R. Armstrong
Browse files
Options
Downloads
Plain Diff
Merge branch 'insane'
Conflicts: UTILSUBS/get_values.f
parents
61395ece
63662177
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ENGINE/g_decode_config.f
+18
-3
18 additions, 3 deletions
ENGINE/g_decode_config.f
EXE/Makefile
+2
-1
2 additions, 1 deletion
EXE/Makefile
UTILSUBS/get_values.f
+3
-3
3 additions, 3 deletions
UTILSUBS/get_values.f
with
23 additions
and
7 deletions
ENGINE/g_decode_config.f
+
18
−
3
View file @
7dd19f86
...
@@ -89,6 +89,7 @@
...
@@ -89,6 +89,7 @@
integer*4 did, plane, counter, signal, nsubadd, bsubadd, modtyp
integer*4 did, plane, counter, signal, nsubadd, bsubadd, modtyp
integer*4 lastroc, lastslot
integer*4 lastroc, lastslot
integer N_lines_read
integer N_lines_read
integer num_commas,ii
logical echo,debug,override
logical echo,debug,override
character*26 lo,HI
character*26 lo,HI
...
@@ -144,7 +145,7 @@
...
@@ -144,7 +145,7 @@
if(echo) call g_log_message(line)
if(echo) call g_log_message(line)
llen = len(line)
! Remove comments (; or !)
llen = len(line)
! Remove comments (; or !)
lpcom = index(line(1:llen),'
;
')
lpcom = index(line(1:llen),'
;
')
if(lpcom.gt.0) llen = lpcom - 1
if(lpcom.gt.0) llen = lpcom - 1
if(llen.gt.0) then
if(llen.gt.0) then
...
@@ -163,7 +164,7 @@
...
@@ -163,7 +164,7 @@
if
(
llen
.gt.
0
)
then
if
(
llen
.gt.
0
)
then
text
=
.false.
text
=
.false.
do
lp
=
1
,
llen
! Shift to upper case
do
lp
=
1
,
llen
! Shift to upper case
m
=
index
(
lo
,
line
(
lp
:
lp
))
m
=
index
(
lo
,
line
(
lp
:
lp
))
if
(
m
.gt.
0
)
then
if
(
m
.gt.
0
)
then
line
(
lp
:
lp
)
=
HI
(
m
:
m
)
line
(
lp
:
lp
)
=
HI
(
m
:
m
)
...
@@ -203,8 +204,22 @@
...
@@ -203,8 +204,22 @@
endif
endif
endif
endif
else
else
read
(
line
(
1
:
llen
),
'(4i15)'
)
subadd
,
plane
,
counter
,
c
determine
number
of
commas
in
the
line
num_commas
=
0
do
ii
=
1
,
llen
if
(
index
(
line
(
ii
:
ii
),
','
)
.gt.
0
)
then
num_commas
=
num_commas
+
1
endif
enddo
if
(
num_commas
.eq.
2
)
then
read
(
line
(
1
:
llen
),
*
)
subadd
,
plane
,
counter
signal
=
0
elseif
(
num_commas
.eq.
3
)
then
read
(
line
(
1
:
llen
),
*
)
subadd
,
plane
,
counter
,
$
signal
$
signal
else
write
(
*
,
*
)
' can not read line'
,
line
(
1
:
llen
)
endif
If
(
OK
.and.
(
roc
.ne.
lastroc
.or.
slot
.ne.
lastslot
))
Then
If
(
OK
.and.
(
roc
.ne.
lastroc
.or.
slot
.ne.
lastslot
))
Then
if
(
g_decode_slotpointer
(
roc
,
slot
)
.le.
0
)
then
if
(
g_decode_slotpointer
(
roc
,
slot
)
.le.
0
)
then
g_decode_slotpointer
(
roc
,
slot
)
=
g_decode_slotpointer
(
roc
,
slot
)
=
...
...
This diff is collapsed.
Click to expand it.
EXE/Makefile
+
2
−
1
View file @
7dd19f86
...
@@ -83,7 +83,8 @@ ifeq ($(MYOS),Linux)
...
@@ -83,7 +83,8 @@ ifeq ($(MYOS),Linux)
ifeq
($(MYREALOS),Darwin)
ifeq
($(MYREALOS),Darwin)
OTHERLIBS
+=
-L
$(
CERN_ROOT
)
/lib
-lpacklib
-lc
-lm
OTHERLIBS
+=
-L
$(
CERN_ROOT
)
/lib
-lpacklib
-lc
-lm
else
else
OTHERLIBS
+=
-L
$(
CERN_ROOT
)
/lib
-lpacklib
-lc
-lm
-lnsl
#OTHERLIBS += -L$(CERN_ROOT)/lib -lpacklib -lc -lm -lnsl
OTHERLIBS
+=
$(
CERN_ROOT
)
/lib/libpacklib.a
$(
CERN_ROOT
)
/lib/libkernlib.a
-lnsl
-lcrypt
-ldl
endif
endif
OURLIBS
:=
$(
OURGENLIBS
)
$(
LIBROOT
)
/libport.a
OURLIBS
:=
$(
OURGENLIBS
)
$(
LIBROOT
)
/libport.a
endif
endif
...
...
This diff is collapsed.
Click to expand it.
UTILSUBS/get_values.f
+
3
−
3
View file @
7dd19f86
...
@@ -73,13 +73,13 @@ c
...
@@ -73,13 +73,13 @@ c
CALL
squeeze
(
this
,
i
)
CALL
squeeze
(
this
,
i
)
IF
(
this
.eq.
' '
)
goto
2222
IF
(
this
.eq.
' '
)
goto
2222
c
READ
(
this
(
1
:
i
),
'(z)'
,
err
=
2222
)
v
(
j
)
c
READ
(
this
(
1
:
i
),
'(z)'
,
err
=
2222
)
v
(
j
)
READ
(
this
(
1
:
i
),
'(z
2
)'
,
err
=
2222
)
v
(
j
)
READ
(
this
(
1
:
i
),
'(z
1
)'
,
err
=
2222
)
v
(
j
)
elseif
(
oct
)
then
elseif
(
oct
)
then
this
(
last_oct
:)
=
' '
this
(
last_oct
:)
=
' '
CALL
squeeze
(
this
,
i
)
CALL
squeeze
(
this
,
i
)
IF
(
this
.eq.
' '
)
goto
2222
IF
(
this
.eq.
' '
)
goto
2222
c
READ
(
this
(
1
:
i
),
'(o)'
,
err
=
2222
)
v
(
j
)
c
READ
(
this
(
1
:
i
),
'(o)'
,
err
=
2222
)
v
(
j
)
READ
(
this
(
1
:
i
),
'(o
2
)'
,
err
=
2222
)
v
(
j
)
READ
(
this
(
1
:
i
),
'(o
1
)'
,
err
=
2222
)
v
(
j
)
elseif
(
bin
)
then
elseif
(
bin
)
then
this
(
last_binary
:)
=
' '
this
(
last_binary
:)
=
' '
CALL
squeeze
(
this
,
i
)
CALL
squeeze
(
this
,
i
)
...
@@ -98,7 +98,7 @@ c READ(this(1:i),'(o)',err=2222) v(j)
...
@@ -98,7 +98,7 @@ c READ(this(1:i),'(o)',err=2222) v(j)
CALL
squeeze
(
this
,
i
)
CALL
squeeze
(
this
,
i
)
IF
(
this
.eq.
' '
)
goto
2222
IF
(
this
.eq.
' '
)
goto
2222
c
READ
(
this
(
1
:
i
),
'(i)'
,
err
=
2222
)
v
(
j
)
c
READ
(
this
(
1
:
i
),
'(i)'
,
err
=
2222
)
v
(
j
)
READ
(
this
(
1
:
i
),
'(i
2
)'
,
err
=
2222
)
v
(
j
)
READ
(
this
(
1
:
i
),
'(i
1
)'
,
err
=
2222
)
v
(
j
)
endif
endif
c
c
this
=
line
(
divider
+1
:)
this
=
line
(
divider
+1
:)
...
...
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