Changeset 7657
- Timestamp:
- 04/26/06 10:53:56 (19 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r7656 r7657 19 19 -*-*- END OF LINE -*-*- 20 20 21 2006/04/26 Daniela Dorner 22 23 * datacenter/macros/fillstar.C, datacenter/macros/setupdb.C: 24 - added four new columns to the table Star 25 26 27 21 28 2006/04/24 Thomas Bretz 22 29 … … 213 220 - added zd angle range and observation period 214 221 215 * datacenter/db/sequenc E.php:222 * datacenter/db/sequence.php: 216 223 - added rel. ontime 217 224 -
trunk/MagicSoft/Mars/datacenter/macros/fillstar.C
r7528 r7657 207 207 208 208 209 g = (TGraph*)arr.FindObjectInCanvas("NumStars", "TGraph", "MHPointing"); 210 if (!g) 211 { 212 cout << "WARNING - Reading of NumStars failed." << endl; 213 return 2; 214 } 215 216 Double_t numstarmean = g->GetMean(2); 217 TString numstarsmean = Form("%5.1f", numstarmean); 218 Double_t numstarrms = g->GetRMS(2); 219 TString numstarsrms = Form("%5.1f", numstarrms); 220 221 g = (TGraph*)arr.FindObjectInCanvas("Brigtness", "TGraph", "MHPointing"); 222 if (!g) 223 { 224 cout << "WARNING - Reading of SkyBrightness failed." << endl; 225 return 2; 226 } 227 228 Double_t brightnessmean = g->GetMean(2); 229 TString skybrightnessmean = Form("%5.1f", brightnessmean); 230 Double_t brightnessrms = g->GetRMS(2); 231 TString skybrightnessrms = Form("%5.1f", brightnessrms); 232 233 209 234 TString sequence = fname(TRegexp("star[0-9]+[.]root$")); 210 235 if (sequence.IsNull()) … … 227 252 cout << " Rate after ImgCl [Hz] " << datarate << endl; 228 253 cout << " Maximum Humidity [%] " << maxhum << endl; 254 cout << " Number of Stars " << numstarsmean << " +/- " << numstarsrms << endl; 255 cout << " Skybrightness " << skybrightnessmean << " +/- " << skybrightnessrms << endl; 229 256 230 257 TString query; … … 241 268 " fDataRate=%d, " 242 269 " fMaxHumidity=%s ," 270 " fNumStarsMean=%s ," 271 " fNumStarsRMS=%s ," 272 " fBrightnessMean=%s ," 273 " fBrightnessRMS=%s ," 243 274 " fInhomogeneity=%s ", 244 275 seq, islands.Data(), ratio.Data(), … … 246 277 muonrate.Data(), PSF.Data(), 247 278 datarate, maxhum.Data(), 279 numstarsmean.Data(), numstarsrms.Data(), 280 skybrightnessmean.Data(), skybrightnessrms.Data(), 248 281 inhomogen.Data()); 249 282 } … … 259 292 " fDataRate=%d, " 260 293 " fMaxHumidity=%s, " 294 " fNumStarsMean=%s ," 295 " fNumStarsRMS=%s ," 296 " fBrightnessMean=%s ," 297 " fBrightnessRMS=%s ," 261 298 " fInhomogeneity=%s " 262 299 " WHERE fSequenceFirst=%d ", … … 265 302 muonrate.Data(), PSF.Data(), 266 303 datarate, maxhum.Data(), 304 numstarsmean.Data(), numstarsrms.Data(), 305 skybrightnessmean.Data(), skybrightnessrms.Data(), 267 306 inhomogen.Data(), seq); 268 307 } 308 309 cout << "Q: " << query << endl; 269 310 270 311 if (dummy) -
trunk/MagicSoft/Mars/datacenter/macros/setupdb.C
r7629 r7657 579 579 " fMaxHumidity FLOAT(6,1) NOT NULL," 580 580 " fInhomogeneity FLOAT(5,1) NOT NULL," 581 " fNumStarsMean FLOAT(5,1) NOT NULL," 582 " fNumStarsRMS FLOAT(5,1) NOT NULL," 583 " fBrightnessMean FLOAT(5,1) NOT NULL," 584 " fBrightnessRMS FLOAT(5,1) NOT NULL," 581 585 " fLastUpdate TIMESTAMP" 582 586 ")"));
Note:
See TracChangeset
for help on using the changeset viewer.