- Timestamp:
- 02/17/04 07:00:43 (21 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 2 added
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r3207 r3209 4 4 5 5 -*-*- END OF LINE -*-*- 6 7 8 9 2004/02/17: Wolfgang Wittek 10 11 * manalysis/MSourcPosfromStarPos.[h,cc] 12 - new class; calculates the position of the source in the camera from 13 the position of a star in the camera and puts it into 14 MSrcPosCam 15 16 6 17 2004/02/16: Abelardo Moralejo 7 18 -
trunk/MagicSoft/Mars/macros/ONOFFAnalysis.C
r3140 r3209 172 172 //----------------------------------------------- 173 173 //const char *offfile = "~magican/ct1test/wittek/offdata.preproc"; 174 const char *offfile = " /data/MAGIC/rootdata/2003_11_29/20031128_032*_D_OffCrab1_E.root";174 const char *offfile = "20040126_OffCrab_"; 175 175 176 176 //const char *onfile = "~magican/ct1test/wittek/mkn421_on.preproc"; … … 203 203 // - write root file for ON (or OFF or MC) data (ON1.root, ...); 204 204 205 Bool_t JobA = k FALSE;205 Bool_t JobA = kTRUE; 206 206 Bool_t GPad = kFALSE; // generate padding histograms? 207 207 Bool_t WPad = kFALSE; // write out padding histograms ? … … 233 233 // - update the input files with the hadroness (==>ON3.root or MC3.root) 234 234 235 Bool_t JobB_SC_UP = k TRUE;235 Bool_t JobB_SC_UP = kFALSE; 236 236 Bool_t CMatrix = kFALSE; // create training and test matrices 237 237 Bool_t RMatrix = kTRUE; // read training and test matrices from file … … 239 239 // and write supercuts parameter values 240 240 // onto the file parSCfile 241 Bool_t RTest = k TRUE; // test the supercuts using the test matrix241 Bool_t RTest = kFALSE; // test the supercuts using the test matrix 242 242 Bool_t WSC = kFALSE; // update input root file ? 243 243 … … 313 313 // for generating the histograms to be used in the padding 314 314 315 315 316 TString fileON = inPath; 316 317 fileON += onfile; 317 318 fileON += "CalibratedEvts"; 318 319 fileON += ".root"; 319 TString fileOFF = offfile; 320 321 TString fileOFF = inPath; 322 fileOFF += offfile; 323 fileOFF += "CalibratedEvts"; 324 fileOFF += ".root"; 325 320 326 TString fileMC = mcfile; 327 fileMC += mcfile; 328 fileMC += "CalibratedEvts"; 329 fileMC += ".root"; 330 321 331 gLog << "fileON, fileOFF, fileMC = " << fileON << ", " 322 332 << fileOFF << ", " << fileMC << endl; … … 329 339 //-------------------------------------------------- 330 340 // type of data to be padded 331 TString typeInput = "ON";332 //TString typeInput = "OFF";341 //TString typeInput = "ON"; 342 TString typeInput = "OFF"; 333 343 //TString typeInput = "MC"; 334 344 gLog << "typeInput = " << typeInput << endl; … … 345 355 346 356 // name of output root file 357 if (typeInput == "ON") 358 TString file(onfile); 359 else if (typeInput == "OFF") 360 TString file(offfile); 361 else if (typeInput == "MC") 362 TString file(mcfile); 363 347 364 TString outNameImage = outPath; 348 outNameImage += onfile;365 outNameImage += file; 349 366 outNameImage += "Hillas"; 350 367 outNameImage += typeInput; … … 1765 1782 1766 1783 TString parSCinit = outPath; 1767 parSCinit += "parSC_060204a";1768 //parSCinit = "";1784 //parSCinit += "parSC_060204"; 1785 parSCinit = ""; 1769 1786 1770 1787 if (parSCinit != "") … … 1785 1802 1786 1803 TString parSCfile = outPath; 1787 parSCfile += "parSC_ 060204b";1804 parSCfile += "parSC_130204a"; 1788 1805 1789 1806 gLog << "parSCfile = " << parSCfile << endl; … … 1946 1963 if (parSCinit == "") 1947 1964 { 1965 /* 1948 1966 Double_t vparams[104] = { 1949 1967 // LengthUp … … 2027 2045 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 2028 2046 0.0, 0.0 }; 2029 2030 2047 */ 2048 2049 2050 Double_t vparams[104] = { 2051 // LengthUp 2052 0.315585, 0.001455, 0.203198, 0.005532, -0.001670, -0.020362, 2053 0.007388, -0.013463, 2054 // LengthLo 2055 0.151530, 0.028323, 0.510707, 0.053089, 0.013708, 2.357993, 2056 0.000080, -0.007157, 2057 // WidthUp 2058 0.145412, -0.001771, 0.054462, 0.022280, -0.009893, 0.056353, 2059 0.020711, -0.016703, 2060 // WidthLo 2061 0.089187, -0.006430, 0.074442, 0.003738, -0.004256, -0.014101, 2062 0.006126, -0.002849, 2063 // DistUp 2064 1.787943, 0.0, 2.942310, 0.199815, 0.0, 0.249909, 2065 0.189697, 0.0, 2066 // DistLo 2067 0.589406, 0.0, -0.083964,-0.007975, 0.0, 0.045374, 2068 -0.001750, 0.0, 2069 // AsymUp 2070 1.e10, 0.0, 0.0, 0.0, 0.0, 0.0, 2071 0.0, 0.0, 2072 // AsymLo 2073 -1.e10, 0.0, 0.0, 0.0, 0.0, 0.0, 2074 0.0, 0.0, 2075 // ConcUp 2076 1.e10, 0.0, 0.0, 0.0, 0.0, 0.0, 2077 0.0, 0.0, 2078 // ConcLo 2079 -1.e10, 0.0, 0.0, 0.0, 0.0, 0.0, 2080 0.0, 0.0, 2081 // Leakage1Up 2082 1.e10, 0.0, 0.0, 0.0, 0.0, 0.0, 2083 0.0, 0.0, 2084 // Leakage1Lo 2085 -1.e10, 0.0, 0.0, 0.0, 0.0, 0.0, 2086 0.0, 0.0, 2087 // AlphaUp 2088 13.12344, 0.0, 0.0, 0.0, 0.0, 0.0, 2089 0.0, 0.0 }; 2090 2091 Double_t vsteps[104] = { 2092 // LengthUp 2093 0.03, 0.0002, 0.02, 0.0006, 0.0002, 0.002, 2094 0.0008, 0.002, 2095 // LengthLo 2096 0.02, 0.003, 0.05, 0.006, 0.002, 0.3, 2097 0.0001, 0.0008, 2098 // WidthUp 2099 0.02, 0.0002, 0.006, 0.003, 0.002, 0.006, 2100 0.002, 0.002, 2101 // WidthLo 2102 0.009, 0.0007, 0.008, 0.0004, 0.0005, 0.002, 2103 0.0007, 0.003, 2104 // DistUp 2105 0.2, 0.0, 0.3, 0.02, 0.0, 0.03, 2106 0.02, 0.0 2107 // DistLo 2108 0.06, 0.0, 0.009, 0.0008, 0.0, 0.005, 2109 0.0002, 0.0 2110 // AsymUp 2111 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 2112 0.0, 0.0, 2113 // AsymLo 2114 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 2115 0.0, 0.0, 2116 // ConcUp 2117 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 2118 0.0, 0.0, 2119 // ConcLo 2120 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 2121 0.0, 0.0, 2122 // Leakage1Up 2123 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 2124 0.0, 0.0, 2125 // Leakage1Lo 2126 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 2127 0.0, 0.0, 2128 // AlphaUp 2129 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 2130 0.0, 0.0 }; 2131 2132 2031 2133 params.Set(104, vparams); 2032 2134 steps.Set (104, vsteps ); -
trunk/MagicSoft/Mars/manalysis/AnalysisLinkDef.h
r3179 r3209 80 80 #pragma link C++ class MArrivalTimeCalc2+; 81 81 82 #pragma link C++ class MSourcePosfromStarPos+; 82 83 #pragma link C++ class MMcCalibrationUpdate+; 83 84 … … 86 87 87 88 #endif 89 90 -
trunk/MagicSoft/Mars/manalysis/Makefile
r3160 r3209 88 88 MArrivalTimeCalc.cc \ 89 89 MArrivalTimeCalc2.cc \ 90 MSourcePosfromStarPos.cc \ 90 91 MMcCalibrationUpdate.cc 91 92
Note:
See TracChangeset
for help on using the changeset viewer.