Changeset 11486
- Timestamp:
- 07/20/11 17:57:34 (13 years ago)
- Location:
- trunk/Mars
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Mars/Changelog
r11461 r11486 18 18 19 19 -*-*- END OF LINE -*-*- 20 21 2011/07/20 Thomas Bretz 22 23 * readdaq.cc: 24 - added support for FITS files 25 26 20 27 21 28 2011/07/19 Thomas Bretz -
trunk/Mars/readdaq.cc
r9141 r11486 15 15 #include "MRawEvtData.h" 16 16 #include "MRawCrateArray.h" 17 #include "MRawFi leRead.h"17 #include "MRawFitsRead.h" 18 18 19 19 … … 48 48 gLog << all << endl; 49 49 gLog << "Sorry the usage is:" << endl; 50 gLog << " readdaq [-h] [-?] [-vn] [-dec] [-a0] inputfile[.raw ]" << endl << endl;50 gLog << " readdaq [-h] [-?] [-vn] [-dec] [-a0] inputfile[.raw|.fits]" << endl << endl; 51 51 gLog << " input file: Magic DAQ binary file." << endl; 52 52 gLog.Usage(); … … 103 103 TString kNamein = arg.GetArgumentStr(0); 104 104 105 if (!kNamein.EndsWith(".raw") && !kNamein.EndsWith(".raw.gz")) 105 if (!kNamein.EndsWith(".raw") && !kNamein.EndsWith(".raw.gz") && 106 !kNamein.EndsWith(".fits") && !kNamein.EndsWith(".fits.gz")) 106 107 kNamein += ".raw"; 107 108 … … 162 163 // be created by MRawFileRead::PreProcess 163 164 // 164 MRawFileRead read(kNamein); 165 read.SetForce(kForce); 166 read.SetForceMode(kForceMode); 167 tasks.AddToList(&read); 165 MRawFileRead *read = MRawFitsRead::IsFits(kNamein) ? new MRawFitsRead(kNamein) : new MRawFileRead(kNamein); 166 read->SetBit(kCanDelete); 167 read->SetForce(kForce); 168 read->SetForceMode(kForceMode); 169 tasks.AddToList(read); 168 170 169 171 MPrint print0;
Note:
See TracChangeset
for help on using the changeset viewer.