Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
Anna
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
LAGO
Software
Anna
Commits
fc52688b
Commit
fc52688b
authored
8 years ago
by
Hernán Asorey
Browse files
Options
Downloads
Patches
Plain Diff
Change the name of variable end as it produce conflicts with new c++ libraries
parent
bd67fc47
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
sol.cc
+6
-6
6 additions, 6 deletions
sol.cc
sol.h
+1
-1
1 addition, 1 deletion
sol.h
with
7 additions
and
7 deletions
sol.cc
+
6
−
6
View file @
fc52688b
...
...
@@ -288,25 +288,25 @@ int main (int argc, char *argv[])
/* preparing for work */
if
(
ipeak
)
{
type
=
'1'
;
end
=
1023
;
if
(
qe
>
end
)
{
end
_hst
=
1023
;
if
(
qe
>
end
_hst
)
{
fprintf
(
stderr
,
"## WARNING ## for peak analysis max. value is 1023. We will integrate up to 1023
\n
"
);
fprintf
(
lof
,
"## WARNING ## for peak analysis max. value is 1023. We will integrate up to 1023
\n
"
);
qe
=
end
;
qe
=
end
_hst
;
}
}
if
(
qe
>
max_charge
)
{
fprintf
(
stderr
,
"## WARNING ## qe can't be greater than max_charge=%d. Changing Qe to %d
\n
"
,
max_charge
,
max_charge
);
fprintf
(
lof
,
"## WARNING ## qe can't be greater than max_charge=%d. Changing Qe to %d
\n
"
,
max_charge
,
max_charge
);
qe
=
end
;
qe
=
end
_hst
;
}
/* determine number of bands */
int
nbands
=
0
;
double
nb
=
0.
;
if
(
iband
)
{
nb
=
(
1.0
*
(
end
-
start
)
/
width
);
nb
=
(
1.0
*
(
end
_hst
-
start
)
/
width
);
if
(
nb
-
int
(
nb
))
nb
+=
1.
;
nbands
=
int
(
nb
);
...
...
@@ -347,7 +347,7 @@ int main (int argc, char *argv[])
fprintf
(
out
,
"# # L2 level file (lago@lagoproject.org): flux of signals as function of time
\n
"
);
fprintf
(
out
,
"# # Analysis is done by integrating the whole channel %d charge histogram in
\n
"
,
channel
);
if
(
iband
)
{
fprintf
(
out
,
"# # %d bands of %d ADCq starting from %d ADCq and up to %d ADCq
\n
"
,
nbands
,
width
,
start
+
1
,
end
+
1
);
fprintf
(
out
,
"# # %d bands of %d ADCq starting from %d ADCq and up to %d ADCq
\n
"
,
nbands
,
width
,
start
+
1
,
end
_hst
+
1
);
fprintf
(
out
,
"# # %d columns format is:
\n
"
,
nbands
+
4
);
if
(
iflux
)
fprintf
(
out
,
"# # utc pressure temperature total_flux(counts/s) band001 band002 ... band%03d
\n
"
,
nbands
);
...
...
This diff is collapsed.
Click to expand it.
sol.h
+
1
−
1
View file @
fc52688b
...
...
@@ -43,7 +43,7 @@ const int max_charge=4096;
int
avg_time
=
10
;
double
fluxtime
=
1.
;
double
diameter
=
0.
,
height
=
0.
;
int
channel
=
0
,
start
=
0
,
width
=
0
,
qs
=
0
,
end
=
max_charge
,
qe
=
max_charge
;
int
channel
=
0
,
start
=
0
,
width
=
0
,
qs
=
0
,
end
_hst
=
max_charge
,
qe
=
max_charge
;
char
type
=
'0'
;
//charge
int
Open
(
char
*
nfi
);
inline
double
sign
(
double
x
);
...
...
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