Changeset 9356 for trunk/MagicSoft
- Timestamp:
- 02/19/09 22:59:24 (16 years ago)
- Location:
- trunk/MagicSoft/Mars
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/MagicSoft/Mars/Changelog
r9355 r9356 90 90 - clean isolated pixels away before calculating image parameters 91 91 - don't clean calibration runs 92 - correct displayed az ba magnetic field 92 - correct displayed az by magnetic field 93 - added auto range for the 2D histograms 94 - set automatic binning for dist 93 95 94 96 * readcorsika.cc: … … 107 109 * ceres.rc: 108 110 - added units for psf 111 - some small updates 109 112 110 113 * msimreflector/MSimReflector.cc: … … 116 119 - don't write PoinitingCorsika anymore. ARRANg already includes 117 120 the rotation 121 122 * mgeom/MGeomCamMagic.[h,cc]: 123 - added a constructor which allows to set the focal distance 124 125 * msimcamera/MSimAPD.cc, msimcamera/MSimGeomCam.cc, 126 msimcamera/MSimRandomPhotons.cc, msimreflector/MSimReflector.cc: 127 - don't create an object if MGeomCam not found, try "MGeomCam" 128 as default instead 129 118 130 119 131 -
trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.cc
r9259 r9356 19 19 ! Author(s): Harald Kornmayer 1/2001 20 20 ! 21 ! Copyright: MAGIC Software Development, 2000-200 321 ! Copyright: MAGIC Software Development, 2000-2008 22 22 ! 23 23 ! … … 45 45 MGeomCamMagic::MGeomCamMagic(const char *name) 46 46 : MGeomCam(577, 17, name, "Geometry information of Magic Camera") 47 { 48 CreateCam(); 49 CreateNN(); 50 InitGeometry(); 51 } 52 53 // -------------------------------------------------------------------------- 54 // 55 // Magic camera has 577 pixels. For geometry and Next Neighbor info see 56 // CreateCam and CreateNN. You can give the distance dist from 57 // the mirror center to the focal plane. 58 // 59 MGeomCamMagic::MGeomCamMagic(Double_t dist, const char *name) 60 : MGeomCam(577, dist, name, "Geometry information of Magic Camera") 47 61 { 48 62 CreateCam(); -
trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.h
r9259 r9356 14 14 public: 15 15 MGeomCamMagic(const char *name=NULL); 16 MGeomCamMagic(Double_t dist, const char *name=NULL); 16 17 17 18 Bool_t HitFrame(MQuaternion p, const MQuaternion &u) const; -
trunk/MagicSoft/Mars/mjobs/MJSimulation.cc
r9352 r9356 189 189 hist.InitName("Impact;Impact;Impact"); 190 190 hist.InitTitle("Impact;West <--> East [m];South <--> North [m]"); 191 hist.SetAutoRange(); 191 192 192 193 hist.AddHist("MCorsikaEvtHeader.fFirstInteractionHeight/100000"); … … 198 199 hist.InitTitle("Sky Origin;Az [deg];Zd [deg]"); 199 200 hist.SetDrawOption("colz"); 201 hist.SetAutoRange(); 200 202 201 203 TString sin2 = "sin(MCorsikaEvtHeader.fZd)*sin(MCorsikaRunHeader.fZdMin*TMath::DegToRad())"; … … 346 348 MBinning binse( 100, 1, 100000, "BinningEnergy", "log"); 347 349 MBinning binss( 100, 1, 10000000, "BinningSize", "log"); 348 MBinning binsi( 50, -250, 250, "BinningImpact");350 MBinning binsi( 100, -500, 500, "BinningImpact"); 349 351 MBinning binsh( 150, 0, 50, "BinningHeight"); 350 352 MBinning binsaz(720, -360, 360, "BinningAz"); … … 352 354 MBinning binsvc( 45, 0, 9, "BinningViewCone"); 353 355 MBinning binsew(150, 0, 50, "BinningEvtWidth"); 356 MBinning binsd("BinningDistC"); 357 MBinning binsd0("BinningDist"); 354 358 MBinning binstr("BinningTrigPos"); 355 359 … … 363 367 plist.AddToList(&binsew); 364 368 plist.AddToList(&binstr); 369 plist.AddToList(&binsd); 370 plist.AddToList(&binsd0); 365 371 366 372 MHn mhn1, mhn2, mhn3; … … 660 666 //------------------------------------------- 661 667 668 MGeomCam *cam = static_cast<MGeomCam*>(env2.GetCont()); 669 662 670 if (binstr.IsDefault()) 663 671 binstr.SetEdgesLin(150, -shape.GetPulseWidth(), 664 672 header.GetFreqSampling()/1000.*header.GetNumSamples()+shape.GetPulseWidth()); 673 674 if (binsd.IsDefault() && cam) 675 binsd.SetEdgesLin(100, 0, cam->GetMaxRadius()*cam->GetConvMm2Deg()); 676 677 if (binsd0.IsDefault() && cam) 678 binsd0.SetEdgesLin(100, 0, cam->GetMaxRadius()*cam->GetConvMm2Deg()); 679 665 680 666 681 header.Print(); … … 711 726 } 712 727 713 if ( env2.GetCont())728 if (cam) 714 729 { 715 730 c.cd(4); … … 719 734 gPad->SetGridy(); 720 735 gROOT->SetSelectedPad(0); 721 MHCamera *c = new MHCamera( static_cast<MGeomCam&>(*env2.GetCont()));736 MHCamera *c = new MHCamera(*cam); 722 737 c->SetStats(kFALSE); 723 738 c->SetBit(MHCamera::kNoLegend); -
trunk/MagicSoft/Mars/msimcamera/MSimAPD.cc
r9349 r9356 100 100 *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl; 101 101 102 fGeom = (MGeomCam*)pList->Find CreateObj(fNameGeomCam);102 fGeom = (MGeomCam*)pList->FindObject("MGeomCam"); 103 103 if (!fGeom) 104 { 105 *fLog << err << "MGeomCam not found... aborting." << endl; 104 106 return kFALSE; 107 } 105 108 } 106 109 -
trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc
r9347 r9356 91 91 *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl; 92 92 93 fGeom = (MGeomCam*)pList->Find CreateObj(fNameGeomCam);93 fGeom = (MGeomCam*)pList->FindObject("MGeomCam"); 94 94 if (!fGeom) 95 { 96 *fLog << err << "MGeomCam not found... aborting." << endl; 95 97 return kFALSE; 98 } 96 99 } 97 100 -
trunk/MagicSoft/Mars/msimcamera/MSimRandomPhotons.cc
r9272 r9356 91 91 *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl; 92 92 93 fGeom = (MGeomCam*)pList->Find CreateObj(fNameGeomCam);93 fGeom = (MGeomCam*)pList->FindObject("MGeomCam"); 94 94 if (!fGeom) 95 { 96 *fLog << err << "MGeomCam not found... aborting." << endl; 95 97 return kFALSE; 98 } 96 99 } 97 100 … … 175 178 // Add a new photon 176 179 // FIXME: SLOW! 177 MPhotonData &ph = fEvt->Add(); 180 MPhotonData &ph = fEvt->Add(); 178 181 179 182 // Set source to NightSky, time to t and tag to pixel index -
trunk/MagicSoft/Mars/msimreflector/MSimReflector.cc
r9354 r9356 121 121 *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl; 122 122 123 fGeomCam = (MGeomCam*)pList->Find CreateObj(fNameGeomCam);123 fGeomCam = (MGeomCam*)pList->FindObject("MGeomCam"); 124 124 if (!fGeomCam) 125 { 126 *fLog << err << "MGeomCam not found... aborting." << endl; 125 127 return kFALSE; 128 } 126 129 } 127 130
Note:
See TracChangeset
for help on using the changeset viewer.