Changeset 9374 for trunk/MagicSoft
- Timestamp:
- 03/02/09 14:34:40 (16 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 33 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r9373 r9374 31 31 msimreflector/MMirrorSquare.[h,cc], msimreflector/MReflector.[h,cc]: 32 32 - added GetA member function 33 34 * manalysis/MCameraData.cc, mbadpixels/MBadPixelsCalc.cc, 35 mbadpixels/MBadPixelsCam.cc, mbadpixels/MBadPixelsTreat.cc, 36 mcalib/MCalibrationCam.cc, mcalib/MCalibrationChargeCalc.cc, 37 mcalib/MCalibrationChargeCam.cc, mcalib/MCalibrationPulseTimeCam.cc, 38 mcalib/MCalibrationRelTimeCalc.cc, mcalib/MCalibrationRelTimeCam.cc, 39 mcalib/MCalibrationTestCalc.cc, mcalib/MCalibrationTestCam.cc, 40 mcorsika/MCorsikaEvtHeader.cc, mfilter/MFSoftwareTrigger.cc, 41 mgeom/MGeomCam.cc, mhcalib/MHCalibrationCam.cc, 42 mhcalib/MHCalibrationChargeCam.cc, mhcalib/MHCalibrationPulseTimeCam.cc, 43 mhcalib/MHCalibrationRelTimeCam.cc, mhft/MHexagonalFTCalc.cc, 44 mhist/MHCamera.cc, mimage/MHillas.cc, mimage/MNewImagePar.cc, 45 mjobs/MJCut.cc, mjobs/MJSimulation.cc, mpedestal/MExtractPedestal.cc, 46 mpedestal/MPedPhotCam.cc, mpedestal/MPedestalCam.cc, 47 mpointing/MPointingPos.h, msignal/MSignalCam.cc, 48 msimcamera/MSimGeomCam.cc: 49 - replaced MGeomPix by MGeom 50 51 * mjobs/MJStar.cc: 52 - added BinningDist 53 - converted Muon cuts from mm to deg 33 54 34 55 -
trunk/MagicSoft/Mars/manalysis/MCameraData.cc
r8491 r9374 43 43 44 44 #include "MGeomCam.h" 45 #include "MGeom Pix.h"45 #include "MGeom.h" 46 46 47 47 #include "MPedPhotCam.h" -
trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCalc.cc
r7760 r9374 67 67 68 68 #include "MGeomCam.h" 69 #include "MGeom Pix.h"69 #include "MGeom.h" 70 70 71 71 #include "MPedPhotCam.h" -
trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc
r9369 r9374 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.5 3 2009-03-01 21:48:13tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.54 2009-03-02 14:32:49 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 47 47 48 48 #include "MGeomCam.h" 49 #include "MGeom Pix.h"49 #include "MGeom.h" 50 50 51 51 ClassImp(MBadPixelsCam); -
trunk/MagicSoft/Mars/mbadpixels/MBadPixelsTreat.cc
r9369 r9374 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.4 2 2009-03-01 21:48:13tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MBadPixelsTreat.cc,v 1.43 2009-03-02 14:32:49 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 85 85 #include "MParList.h" 86 86 87 #include "MGeom Pix.h"87 #include "MGeom.h" 88 88 #include "MGeomCam.h" 89 89 -
trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc
r8504 r9374 59 59 60 60 #include "MGeomCam.h" 61 #include "MGeom Pix.h"61 #include "MGeom.h" 62 62 63 63 #include "MBadPixelsCam.h" -
trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc
r9369 r9374 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.18 6 2009-03-01 21:48:13tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.187 2009-03-02 14:32:49 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 221 221 222 222 #include "MGeomCam.h" 223 #include "MGeom Pix.h"223 #include "MGeom.h" 224 224 #include "MHCamera.h" 225 225 -
trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCam.cc
r8923 r9374 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.7 2 2008-06-03 15:26:39 tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCam.cc,v 1.73 2009-03-02 14:32:49 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 95 95 96 96 #include "MGeomCam.h" 97 #include "MGeom Pix.h"97 #include "MGeom.h" 98 98 99 99 #include "MBadPixelsCam.h" -
trunk/MagicSoft/Mars/mcalib/MCalibrationPulseTimeCam.cc
r8957 r9374 82 82 83 83 #include "MGeomCam.h" 84 #include "MGeom Pix.h"84 #include "MGeom.h" 85 85 86 86 #include "MCalibrationPix.h" -
trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc
r8582 r9374 72 72 73 73 #include "MGeomCam.h" 74 #include "MGeom Pix.h"74 #include "MGeom.h" 75 75 76 76 #include "MCalibrationRelTimeCam.h" -
trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCam.cc
r8497 r9374 82 82 83 83 #include "MGeomCam.h" 84 #include "MGeom Pix.h"84 #include "MGeom.h" 85 85 86 86 #include "MCalibrationRelTimePix.h" -
trunk/MagicSoft/Mars/mcalib/MCalibrationTestCalc.cc
r9369 r9374 60 60 61 61 #include "MGeomCam.h" 62 #include "MGeom Pix.h"62 #include "MGeom.h" 63 63 #include "MHCamera.h" 64 64 -
trunk/MagicSoft/Mars/mcalib/MCalibrationTestCam.cc
r6243 r9374 42 42 43 43 #include "MGeomCam.h" 44 #include "MGeom Pix.h"44 #include "MGeom.h" 45 45 46 46 ClassImp(MCalibrationTestCam); -
trunk/MagicSoft/Mars/mcorsika/MCorsikaEvtHeader.cc
r9336 r9374 112 112 fStartAltitude = f[3]; 113 113 fFirstTargetNum = f[4]; 114 fFirstInteractionHeight = f[5]; 114 fFirstInteractionHeight = f[5]; // FIXME: Could be negative 115 115 116 116 // Pointing opposite particle direction -
trunk/MagicSoft/Mars/mfilter/MFSoftwareTrigger.cc
r9369 r9374 72 72 #include "MParList.h" 73 73 74 #include "MGeom Pix.h"74 #include "MGeom.h" 75 75 #include "MGeomCam.h" 76 76 -
trunk/MagicSoft/Mars/mgeom/MGeomCam.cc
r9369 r9374 73 73 #include "MLogManip.h" 74 74 75 #include "MGeom Pix.h"75 #include "MGeom.h" 76 76 77 77 ClassImp(MGeomCam); … … 177 177 void MGeomCam::InitOuterRing() 178 178 { 179 fPixels.R__FOR_EACH(MGeom Pix, CheckOuterRing)(*this);179 fPixels.R__FOR_EACH(MGeom, CheckOuterRing)(*this); 180 180 } 181 181 … … 518 518 // 519 519 // Return direction of p2 w.r.t. p1. For more details 520 // see MGeom Pix::GetDirection520 // see MGeom::GetDirection 521 521 // 522 522 Int_t MGeomCam::GetDirection(UInt_t p1, UInt_t p2) const -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationCam.cc
r9153 r9374 85 85 86 86 #include "MGeomCam.h" 87 #include "MGeom Pix.h"87 #include "MGeom.h" 88 88 89 89 #include "MParList.h" -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc
r8988 r9374 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.6 2 2008-06-30 09:36:36tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.63 2009-03-02 14:32:50 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 147 147 148 148 #include "MGeomCam.h" 149 #include "MGeom Pix.h"149 #include "MGeom.h" 150 150 151 151 #include "MBadPixelsCam.h" -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc
r9157 r9374 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.4 3 2008-11-12 15:55:32tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.44 2009-03-02 14:32:50 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 133 133 134 134 #include "MGeomCam.h" 135 #include "MGeom Pix.h"135 #include "MGeom.h" 136 136 137 137 #include "MBadPixelsCam.h" -
trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc
r8910 r9374 117 117 118 118 #include "MGeomCam.h" 119 #include "MGeom Pix.h"119 #include "MGeom.h" 120 120 121 121 #include "MBadPixelsCam.h" -
trunk/MagicSoft/Mars/mhft/MHexagonalFTCalc.cc
r6857 r9374 58 58 59 59 #include "MGeomCam.h" 60 #include "MGeom Pix.h"60 #include "MGeom.h" 61 61 62 62 #include "MSignalCam.h" -
trunk/MagicSoft/Mars/mhist/MHCamera.cc
r9369 r9374 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.1 19 2009-03-01 21:48:14tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MHCamera.cc,v 1.120 2009-03-02 14:32:50 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 80 80 #include "MBinning.h" 81 81 82 #include "MGeom Pix.h"82 #include "MGeom.h" 83 83 #include "MGeomCam.h" 84 84 -
trunk/MagicSoft/Mars/mimage/MHillas.cc
r9369 r9374 66 66 #include <TVector2.h> 67 67 68 #include "MGeom Pix.h"68 #include "MGeom.h" 69 69 #include "MGeomCam.h" 70 70 -
trunk/MagicSoft/Mars/mimage/MNewImagePar.cc
r9369 r9374 84 84 85 85 #include "MGeomCam.h" 86 #include "MGeom Pix.h"86 #include "MGeom.h" 87 87 88 88 #include "MSignalCam.h" -
trunk/MagicSoft/Mars/mjobs/MJCut.cc
r9278 r9374 259 259 if (fNameResult.IsNull() && fStoreResult) 260 260 { 261 // If no special name fNameResult is given but the result should be stored, 262 // search for a file named oname (fNameOutput or ganymed%08d.root) 261 263 file = (TFile*)gROOT->GetListOfFiles()->FindObject(oname); 262 if (file) 263 file->cd(); 264 if (!file) 265 { 266 *fLog << err << "ERROR - File " << oname << " expected to be open, but isn't..." << endl; 267 return kFALSE; 268 } 269 270 file->cd(); 264 271 } 265 272 else 273 { 274 // If special name fNameResult is given or no storage requested, 275 // open a new file named oname (fNameOutput or ganymed%08d.root) 266 276 file = TFile::Open(oname, fOverwrite?"RECREATE":"NEW", "File created by MJCut", 9); 267 277 268 if (!file) 269 { 270 *fLog << err << "ERROR - Couldn't open file " << oname << " for writing..." << endl; 271 return kFALSE; 272 } 273 278 if (!file) 279 { 280 *fLog << err << "ERROR - Couldn't open new file " << oname << " for writing..." << endl; 281 return kFALSE; 282 } 283 } 284 285 // Write container to output file 274 286 const Bool_t rc = WriteContainer(cont); 275 287 288 // If file was newly opened, close it 276 289 if (!(fNameResult.IsNull() && fStoreResult)) 277 290 delete file; 278 291 292 // Return result of writing 279 293 return rc; 280 294 } … … 301 315 arr.Add((TObject*)(&halpha->GetAlphaFitter())); 302 316 303 // Save also the dataset 317 // Save also the dataset, environment and display 304 318 arr.Add(const_cast<MDataSet*>(&set)); 319 arr.Add(const_cast<TEnv*>(GetEnv())); 320 if (fDisplay) 321 arr.Add(fDisplay); 305 322 306 323 const Int_t num = set.GetNumAnalysis(); … … 317 334 } 318 335 } 319 320 if (fDisplay)321 arr.Add(fDisplay);322 323 arr.Add(const_cast<TEnv*>(GetEnv()));324 336 325 337 return WriteContainer(arr, fname, "UPDATE"); … … 995 1007 fillsrc.SetNameTab("SrcPos"); 996 1008 997 if (set.IsWobbleMode() && !set.IsMonteCarlo())1009 if (set.IsWobbleMode()/* && !set.IsMonteCarlo()*/) 998 1010 tlist2.AddToListBefore(&fillsrc, &hcalc); 999 1011 -
trunk/MagicSoft/Mars/mjobs/MJSimulation.cc
r9362 r9374 496 496 // NSB = 0.2*6e-3 497 497 498 // FIXME: Simulate photons before QE! 498 // MAGIC: 84MHz / Pixel 499 // DWARF: 14MHz-25Mhz / APD 500 501 502 // FIXME: Simulate photons before cones and QE! 499 503 500 504 MSimRandomPhotons simnsb; … … 520 524 521 525 MParameterD pulpos("IntendedPulsePos"); 522 // pulpos.SetVal(40); // [ns] 526 // FIXME: Set a default which could be 1/3 of the digitization window 527 // pulpos.SetVal(40); // [ns] 523 528 plist.AddToList(&pulpos); 524 529 -
trunk/MagicSoft/Mars/mjobs/MJStar.cc
r9369 r9374 174 174 MBinning bins5("BinningMuonWidth"); 175 175 MBinning bins6("BinningArcPhi"); 176 MBinning binsd("BinningDist"); 176 177 plist.AddToList(&bins1); 177 178 plist.AddToList(&bins2); … … 180 181 plist.AddToList(&bins5); 181 182 plist.AddToList(&bins6); 183 plist.AddToList(&binsd); 182 184 183 185 … … 434 436 MFDataPhrase fmuon1("MHillas.fSize>150 && MNewImagePar.fConcCOG<0.1", "MuonPreCut"); 435 437 // Filter to calculate further muon parameters 436 MFDataPhrase fmuon2("(MMuonSearchPar.fRadius >180) && (MMuonSearchPar.fRadius<400) &&"437 "(MMuonSearchPar.fDeviation <45)", "MuonSearchCut");438 MFDataPhrase fmuon2("(MMuonSearchPar.fRadius*MGeomCam.fConvMm2Deg>0.6) && (MMuonSearchPar.fRadius*MGeomCam.fConvMm2Deg<1.35) &&" 439 "(MMuonSearchPar.fDeviation*MGeomCam.fConvMm2Deg<0.152)", "MuonSearchCut"); 438 440 // Filter to fill the MHMuonPar 439 MFDataPhrase fmuon3("(MMuonCalibPar.fArcPhi>190) && (MMuonSearchPar.fDeviation <35) &&"441 MFDataPhrase fmuon3("(MMuonCalibPar.fArcPhi>190) && (MMuonSearchPar.fDeviation*MGeomCam.fConvMm2Deg<0.118) &&" 440 442 "(MMuonCalibPar.fArcWidth<0.20) && (MMuonCalibPar.fArcWidth>0.04) &&" 441 443 "MMuonCalibPar.fRelTimeSigma<1.5", -
trunk/MagicSoft/Mars/mpedestal/MExtractPedestal.cc
r9157 r9374 1 1 /* ======================================================================== *\ 2 ! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1. 39 2008-11-12 16:04:18tbretz Exp $2 ! $Name: not supported by cvs2svn $:$Id: MExtractPedestal.cc,v 1.40 2009-03-02 14:32:50 tbretz Exp $ 3 3 ! -------------------------------------------------------------------------- 4 4 ! … … 166 166 #include "MPedestalCam.h" 167 167 168 #include "MGeom Pix.h"168 #include "MGeom.h" 169 169 #include "MGeomCam.h" 170 170 -
trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc
r7804 r9374 50 50 51 51 #include "MGeomCam.h" 52 #include "MGeom Pix.h"52 #include "MGeom.h" 53 53 54 54 #include "MBadPixelsCam.h" -
trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc
r8912 r9374 58 58 59 59 #include "MGeomCam.h" 60 #include "MGeom Pix.h"60 #include "MGeom.h" 61 61 62 62 #include "MBadPixelsCam.h" -
trunk/MagicSoft/Mars/mpointing/MPointingPos.h
r8915 r9374 27 27 Double_t fHa; // [h] Hour angle 28 28 Double_t fDec; // [deg] Declination 29 30 // Hour angle! 31 // Angle to magnetic field! 29 32 30 33 public: -
trunk/MagicSoft/Mars/msignal/MSignalCam.cc
r9369 r9374 45 45 46 46 #include "MGeomCam.h" 47 #include "MGeom Pix.h"47 #include "MGeom.h" 48 48 49 49 ClassImp(MSignalCam); -
trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc
r9356 r9374 54 54 55 55 #include "MGeomCam.h" 56 #include "MGeom Pix.h"56 #include "MGeom.h" 57 57 58 58 #include "MPhotonEvent.h"
Note:
See TracChangeset
for help on using the changeset viewer.