Skip to content

Commit 72c6aad

Browse files
danielhattondanielhatton
authored
Add files via upload
Some code that had been commented-out for debugging purposes reenabled.
1 parent 5fe67ce commit 72c6aad

File tree

1 file changed

+76
-76
lines changed

1 file changed

+76
-76
lines changed

‎leastsqtobayes‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -68,105 +68,105 @@ if ($otherperms % 4 > 1.5) {
6868
"directory, which in this case, is a security flaw.\n" ;
6969
}
7070

71-
# if(-e "initialguesses.par") {
71+
if(-e "initialguesses.par") {
7272

73-
# die "\nTo work, this program needs to be able to create a\n" .
74-
# "temporary file initialguesses.par. A file of that\n" .
75-
# "name already exists! Check whether its contents are\n" .
76-
# "valuable, and either move or delete them accordingly\n" .
77-
# "before running this program.\n" ;
73+
die "\nTo work, this program needs to be able to create a\n" .
74+
"temporary file initialguesses.par. A file of that\n" .
75+
"name already exists! Check whether its contents are\n" .
76+
"valuable, and either move or delete them accordingly\n" .
77+
"before running this program.\n" ;
7878

79-
# }
79+
}
8080

81-
# if(-e "loadinfunction.gp") {
81+
if(-e "loadinfunction.gp") {
8282

83-
# die "\nTo work, this program needs to be able to create a\n" .
84-
# "temporary file loadinfunction.gp. A file of that\n" .
85-
# "name already exists! Check whether its contents are\n" .
86-
# "valuable, and either move or delete them accordingly\n" .
87-
# "before running this program.\n" ;
83+
die "\nTo work, this program needs to be able to create a\n" .
84+
"temporary file loadinfunction.gp. A file of that\n" .
85+
"name already exists! Check whether its contents are\n" .
86+
"valuable, and either move or delete them accordingly\n" .
87+
"before running this program.\n" ;
8888

89-
# }
89+
}
9090

91-
# if (-e "priorsforoctave.m") {
91+
if (-e "priorsforoctave.m") {
9292

93-
# die "\nTo work, this program needs to be able to create a\n" .
94-
# "temporary file priorsforoctave.m. A file of that\n" .
95-
# "name already exists! Check whether its contents are\n" .
96-
# "valuable, and either move or delete them accordingly\n" .
97-
# "before running this program.\n" ;
93+
die "\nTo work, this program needs to be able to create a\n" .
94+
"temporary file priorsforoctave.m. A file of that\n" .
95+
"name already exists! Check whether its contents are\n" .
96+
"valuable, and either move or delete them accordingly\n" .
97+
"before running this program.\n" ;
9898

99-
# }
99+
}
100100

101-
# if(-e "loadinfunction.gp") {
101+
if(-e "loadinfunction.gp") {
102102

103-
# die "\nTo work, this program needs to be able to create a\n" .
104-
# "temporary file fitcommand.gp. A file of that\n" .
105-
# "name already exists! Check whether its contents are\n" .
106-
# "valuable, and either move or delete them accordingly\n" .
107-
# "before running this program.\n" ;
103+
die "\nTo work, this program needs to be able to create a\n" .
104+
"temporary file fitcommand.gp. A file of that\n" .
105+
"name already exists! Check whether its contents are\n" .
106+
"valuable, and either move or delete them accordingly\n" .
107+
"before running this program.\n" ;
108108

109-
# }
109+
}
110110

111-
# if(-e "epilogue.gp") {
111+
if(-e "epilogue.gp") {
112112

113-
# die "\nTo work, this program needs to be able to create a\n" .
114-
# "temporary file epilogue.gp. A file of that\n" .
115-
# "name already exists! Check whether its contents are\n" .
116-
# "valuable, and either move or delete them accordingly\n" .
117-
# "before running this program.\n" ;
113+
die "\nTo work, this program needs to be able to create a\n" .
114+
"temporary file epilogue.gp. A file of that\n" .
115+
"name already exists! Check whether its contents are\n" .
116+
"valuable, and either move or delete them accordingly\n" .
117+
"before running this program.\n" ;
118118

119-
# }
119+
}
120120

121-
# if(-e "fitresults.par") {
121+
if(-e "fitresults.par") {
122122

123-
# die "\nTo work, this program needs to be able to create a\n" .
124-
# "temporary file fitresults.par. A file of that\n" .
125-
# "name already exists! Check whether its contents are\n" .
126-
# "valuable, and either move or delete them accordingly\n" .
127-
# "before running this program.\n" ;
123+
die "\nTo work, this program needs to be able to create a\n" .
124+
"temporary file fitresults.par. A file of that\n" .
125+
"name already exists! Check whether its contents are\n" .
126+
"valuable, and either move or delete them accordingly\n" .
127+
"before running this program.\n" ;
128128

129-
# }
129+
}
130130

131-
# if(-e "gnuplot_outputs.m") {
131+
if(-e "gnuplot_outputs.m") {
132132

133-
# die "\nTo work, this program needs to be able to create a\n" .
134-
# "temporary file gnuplot_outputs.m. A file of that\n" .
135-
# "name already exists! Check whether its contents are\n" .
136-
# "valuable, and either move or delete them accordingly\n" .
137-
# "before running this program.\n" ;
133+
die "\nTo work, this program needs to be able to create a\n" .
134+
"temporary file gnuplot_outputs.m. A file of that\n" .
135+
"name already exists! Check whether its contents are\n" .
136+
"valuable, and either move or delete them accordingly\n" .
137+
"before running this program.\n" ;
138138

139-
# }
139+
}
140140

141-
# if(-e "numberofdata.gp") {
141+
if(-e "numberofdata.gp") {
142142

143-
# die "\nTo work, this program needs to be able to create a\n" .
144-
# "temporary file numberofdata.gp. A file of that\n" .
145-
# "name already exists! Check whether its contents are\n" .
146-
# "valuable, and either move or delete them accordingly\n" .
147-
# "before running this program.\n" ;
143+
die "\nTo work, this program needs to be able to create a\n" .
144+
"temporary file numberofdata.gp. A file of that\n" .
145+
"name already exists! Check whether its contents are\n" .
146+
"valuable, and either move or delete them accordingly\n" .
147+
"before running this program.\n" ;
148148

149-
# }
149+
}
150150

151-
# if(-e "pickout_epilogue.gp") {
151+
if(-e "pickout_epilogue.gp") {
152152

153-
# die "\nTo work, this program needs to be able to create a\n" .
154-
# "temporary file pickout_epilogue.gp. A file of that\n" .
155-
# "name already exists! Check whether its contents are\n" .
156-
# "valuable, and either move or delete them accordingly\n" .
157-
# "before running this program.\n" ;
153+
die "\nTo work, this program needs to be able to create a\n" .
154+
"temporary file pickout_epilogue.gp. A file of that\n" .
155+
"name already exists! Check whether its contents are\n" .
156+
"valuable, and either move or delete them accordingly\n" .
157+
"before running this program.\n" ;
158158

159-
# }
159+
}
160160

161-
# if(-e "inversesquareoreareffectiveuncertainties.m") {
161+
if(-e "inversesquareoreareffectiveuncertainties.m") {
162162

163-
# die "\nTo work, this program needs to be able to create a\n" .
164-
# "temporary file inversesquareoreareffectiveuncertainties.m.\n" .
165-
# "A file of that name already exists! Check whether its\n" .
166-
# "contents are valuable, and either move or delete them accordingly\n" .
167-
# "before running this program.\n" ;
163+
die "\nTo work, this program needs to be able to create a\n" .
164+
"temporary file inversesquareoreareffectiveuncertainties.m.\n" .
165+
"A file of that name already exists! Check whether its\n" .
166+
"contents are valuable, and either move or delete them accordingly\n" .
167+
"before running this program.\n" ;
168168

169-
# }
169+
}
170170

171171
my $usrparamsandpriors = $ARGV[0] ;
172172
my $functionname = $ARGV[1] ;
@@ -792,9 +792,9 @@ close OREARFILE ;
792792

793793
# Get rid of temporary files that are no longer needed
794794

795-
# unlink("loadinfunction.gp", "initialguesses.par", "fitcommand.gp",
796-
# "epilogue.gp", "fitresults.par", "numberofdata.gp",
797-
# "pickout_epilogue.gp") ;
795+
unlink("loadinfunction.gp", "initialguesses.par", "fitcommand.gp",
796+
"epilogue.gp", "fitresults.par", "numberofdata.gp",
797+
"pickout_epilogue.gp") ;
798798

799799
# Run the Octave script that inteprets the results in Bayesian
800800
# terms
@@ -806,9 +806,9 @@ printf STDOUT "\n" . $octaveoutput . "\n" ;
806806

807807
# Get rid of some temporary files that are no longer needed
808808

809-
# unlink("gnuplot_outputs.m",
810-
# "inversesquareoreareffectiveuncertainties.m",
811-
# "priorsforoctave.m") ;
809+
unlink("gnuplot_outputs.m",
810+
"inversesquareoreareffectiveuncertainties.m",
811+
"priorsforoctave.m") ;
812812

813813
sub drawfromlorentzian {
814814

0 commit comments

Comments
 (0)