Index: trunk/MagicSoft/Mars/macros/getExtractor.C =================================================================== --- trunk/MagicSoft/Mars/macros/getExtractor.C (revision 5606) +++ trunk/MagicSoft/Mars/macros/getExtractor.C (revision 5607) @@ -34,54 +34,54 @@ // as specified in the TDAS-Extractor with the following meaning: // -// Nr. Extractor Parameters << endl; -// -// MExtractFixedWindow: << endl; -// with the following parameters, if 'maxbin' defines the mean position << endl; -// of the High-Gain FADC slice carrying the pulse maximum: << endl; -// 1: SetRange('maxbin'-1,'maxbin'+2,'maxbin'+0.5,'maxbin'+3.5) << endl; -// 2: SetRange('maxbin'-1,'maxbin'+2,'maxbin'-0.5,'maxbin'+4.5) << endl; -// 3: SetRange('maxbin'-2,'maxbin'+3,'maxbin'-0.5,'maxbin'+4.5) << endl; -// 4: SetRange('maxbin'-3,'maxbin'+4,'maxbin'-1.5,'maxbin'+5.5) << endl; -// 5: SetRange('maxbin'-5,'maxbin'+8,'maxbin'-1.5,'maxbin'+7.5) << endl; -// MExtractFixedWindowSpline: << endl; -// 6: SetRange('maxbin'-1,'maxbin'+2,'maxbin'+0.5,'maxbin'+3.5) << endl; -// 7: SetRange('maxbin'-1,'maxbin'+2,'maxbin'-0.5,'maxbin'+4.5) << endl; -// 8: SetRange('maxbin'-2,'maxbin'+3,'maxbin'-0.5,'maxbin'+4.5) << endl; -// 9: SetRange('maxbin'-3,'maxbin'+4,'maxbin'-1.5,'maxbin'+5.5) << endl; -// 10: SetRange('maxbin'-5,'maxbin'+8,'maxbin'-1.5,'maxbin'+7.5) << endl; -// MExtractFixedWindowPeakSearch: << endl; -// SetRange(0,18,2,14) and the following parameters: << endl; -// 11: SetWindows(2,2,2) << endl; -// 12: SetWindows(4,4,2) << endl; -// 13: SetWindows(4,6,4) << endl; -// 14: SetWindows(6,6,4) << endl; -// 15: SetWindows(8,8,4) << endl; -// 16: SetWindows(14,10,4) << endl; -// MExtractTimeAndChargeSlidingWindow: << endl; -// SetRange(0,18,2,14) and the following parameters: << endl; -// 17: SetWindowSize(2,2) << endl; -// 18: SetWindowSize(4,4) << endl; -// 19: SetWindowSize(4,6) << endl; -// 20: SetWindowSize(6,6) << endl; -// 21: SetWindowSize(8,8) << endl; -// 22: SetWindowSize(14,10) << endl; -// MExtractTimeAndChargeSpline: << endl; -// 23: SetChargeType(MExtractTimeAndChargeSpline::kAmplitude << endl; -// SetRange(0,10,4,11) << endl; -// 24: SetChargeType(MExtractTimeAndChargeSpline::kIntegral) and: << endl; -// SetRange(0,18,2,14) and the following parameters: << endl; -// SetRiseTime(0.5); SetFallTime(0.5) << endl; -// 25: SetRiseTime(0.5); SetFallTime(1.5) << endl; -// 26: SetRiseTime(0.5); SetFallTime(2.5) << endl; -// 27: SetRiseTime(1.5); SetFallTime(4.5) << endl; -// MExtractTimeAndChargeDigitalFilter << endl; -// SetRange(0,18,2,14) and the following parameters: << endl; -// 28: SetNameWeightsFile('msignal/cosmics_weights.dat') << endl; -// 29: SetNameWeightsFile('msignal/cosmics_weights4.dat') << endl; -// 30: SetNameWeightsFile('msignal/cosmics_weights_logain.dat') << endl; -// 31: SetNameWeightsFile('msignal/cosmics_weights4_logain.dat') << endl; -// 32: SetNameWeightsFile('msignal/calibration_weights_UV.dat') << endl; -// 33: SetNameWeightsFile('msignal/calibration_weights_UV_logain.dat') << endl; -// 34: Real Fit: (not yet implemented) << endl; +// Nr. Extractor Parameters +// +// MExtractFixedWindow: +// with the following parameters, if 'maxbin' defines the mean position +// of the High-Gain FADC slice carrying the pulse maximum: +// 1: SetRange('maxbin'-1,'maxbin'+2,'maxbin'+0.5,'maxbin'+3.5) +// 2: SetRange('maxbin'-1,'maxbin'+2,'maxbin'-0.5,'maxbin'+4.5) +// 3: SetRange('maxbin'-2,'maxbin'+3,'maxbin'-0.5,'maxbin'+4.5) +// 4: SetRange('maxbin'-3,'maxbin'+4,'maxbin'-1.5,'maxbin'+5.5) +// 5: SetRange('maxbin'-5,'maxbin'+8,'maxbin'-1.5,'maxbin'+7.5) +// MExtractFixedWindowSpline: +// 6: SetRange('maxbin'-1,'maxbin'+2,'maxbin'+0.5,'maxbin'+3.5) +// 7: SetRange('maxbin'-1,'maxbin'+2,'maxbin'-0.5,'maxbin'+4.5) +// 8: SetRange('maxbin'-2,'maxbin'+3,'maxbin'-0.5,'maxbin'+4.5) +// 9: SetRange('maxbin'-3,'maxbin'+4,'maxbin'-1.5,'maxbin'+5.5) +// 10: SetRange('maxbin'-5,'maxbin'+8,'maxbin'-1.5,'maxbin'+7.5) +// MExtractFixedWindowPeakSearch: +// SetRange(0,18,2,14) and the following parameters: +// 11: SetWindows(2,2,2) +// 12: SetWindows(4,4,2) +// 13: SetWindows(4,6,4) +// 14: SetWindows(6,6,4) +// 15: SetWindows(8,8,4) +// 16: SetWindows(14,10,4) +// MExtractTimeAndChargeSlidingWindow: +// SetRange(0,18,2,14) and the following parameters: +// 17: SetWindowSize(2,2) +// 18: SetWindowSize(4,4) +// 19: SetWindowSize(4,6) +// 20: SetWindowSize(6,6) +// 21: SetWindowSize(8,8) +// 22: SetWindowSize(14,10) +// MExtractTimeAndChargeSpline: +// 23: SetChargeType(MExtractTimeAndChargeSpline::kAmplitude +// SetRange(0,13,2,13) +// 24: SetChargeType(MExtractTimeAndChargeSpline::kIntegral) and: +// SetRange(0,18,2,14) and the following parameters: +// SetRiseTime(0.5); SetFallTime(0.5) +// 25: SetRiseTime(0.5); SetFallTime(1.5) +// 26: SetRiseTime(0.5); SetFallTime(2.5) +// 27: SetRiseTime(1.5); SetFallTime(4.5) +// MExtractTimeAndChargeDigitalFilter +// SetRange(0,18,2,14) and the following parameters: +// 28: SetNameWeightsFile('msignal/cosmics_weights.dat') +// 29: SetNameWeightsFile('msignal/cosmics_weights4.dat') +// 30: SetNameWeightsFile('msignal/cosmics_weights_logain.dat') +// 31: SetNameWeightsFile('msignal/cosmics_weights4_logain.dat') +// 32: SetNameWeightsFile('msignal/calibration_weights_UV.dat') +// 33: SetNameWeightsFile('msignal/calibration_weights_UV_logain.dat') +// 34: Real Fit: (not yet implemented) // // The extractor will also carry a meaningful name, storing all information about its @@ -231,4 +231,5 @@ case 11: ((MExtractFixedWindowPeakSearch*)extractor)->SetWindows(2,2,2); + ((MExtractFixedWindowPeakSearch*)extractor)->SetOffsetFromWindow(0); break; case 12: @@ -237,4 +238,5 @@ case 13: ((MExtractFixedWindowPeakSearch*)extractor)->SetWindows(4,6,4); + ((MExtractFixedWindowPeakSearch*)extractor)->SetOffsetFromWindow(0); break; case 14: @@ -246,4 +248,5 @@ case 16: ((MExtractFixedWindowPeakSearch*)extractor)->SetWindows(14,10,4); + ((MExtractFixedWindowPeakSearch*)extractor)->SetOffsetFromWindow(2); break; // MExtractTimeAndChargeSlidingWindow @@ -269,5 +272,5 @@ case 23: ((MExtractTimeAndChargeSpline*)extractor)->SetChargeType(MExtractTimeAndChargeSpline::kAmplitude); - extractor->SetRange(0,10,4,11); + extractor->SetRange(0,13,2,13); extractor->SetName(Form("%s_Amplitude",extractor->GetName())); break;