Changeset 9356 for trunk

Timestamp:

02/19/09 22:59:24 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (3 diffs)
• mgeom/MGeomCamMagic.cc (modified) (2 diffs)
• mgeom/MGeomCamMagic.h (modified) (1 diff)
• mjobs/MJSimulation.cc (modified) (8 diffs)
• msimcamera/MSimAPD.cc (modified) (1 diff)
• msimcamera/MSimGeomCam.cc (modified) (1 diff)
• msimcamera/MSimRandomPhotons.cc (modified) (2 diffs)
• msimreflector/MSimReflector.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -90 +90 @@
      - clean isolated pixels away before calculating image parameters
      - don't clean calibration runs
-     - correct displayed az ba magnetic field
+     - correct displayed az by magnetic field
+     - added auto range for the 2D histograms
+     - set automatic binning for dist
 
    * readcorsika.cc:
@@ -107 +109 @@
    * ceres.rc:
      - added units for psf
+     - some small updates
 
    * msimreflector/MSimReflector.cc:
@@ -116 +119 @@
      - don't write PoinitingCorsika anymore. ARRANg already includes
        the rotation
+
+   * mgeom/MGeomCamMagic.[h,cc]:
+     - added a constructor which allows to set the focal distance
+
+   * msimcamera/MSimAPD.cc, msimcamera/MSimGeomCam.cc,
+     msimcamera/MSimRandomPhotons.cc, msimreflector/MSimReflector.cc:
+     - don't create an object if MGeomCam not found, try "MGeomCam"
+       as default instead
+
 
 

trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.cc

@@ -19 +19 @@
 !   Author(s): Harald Kornmayer 1/2001
 !
-!   Copyright: MAGIC Software Development, 2000-2003
+!   Copyright: MAGIC Software Development, 2000-2008
 !
 !
@@ -45 +45 @@
 MGeomCamMagic::MGeomCamMagic(const char *name)
     : MGeomCam(577, 17, name, "Geometry information of Magic Camera")
+{
+    CreateCam();
+    CreateNN();
+    InitGeometry();
+}
+
+// --------------------------------------------------------------------------
+//
+//  Magic camera has 577 pixels. For geometry and Next Neighbor info see
+//  CreateCam and CreateNN. You can give the distance dist from
+//  the mirror center to the focal plane.
+//
+MGeomCamMagic::MGeomCamMagic(Double_t dist, const char *name)
+    : MGeomCam(577, dist, name, "Geometry information of Magic Camera")
 {
     CreateCam();

trunk/MagicSoft/Mars/mgeom/MGeomCamMagic.h

@@ -14 +14 @@
 public:
     MGeomCamMagic(const char *name=NULL);
+    MGeomCamMagic(Double_t dist, const char *name=NULL);
 
     Bool_t HitFrame(MQuaternion p, const MQuaternion &u) const;

trunk/MagicSoft/Mars/mjobs/MJSimulation.cc

@@ -189 +189 @@
     hist.InitName("Impact;Impact;Impact");
     hist.InitTitle("Impact;West <--> East [m];South <--> North [m]");
+    hist.SetAutoRange();
 
     hist.AddHist("MCorsikaEvtHeader.fFirstInteractionHeight/100000");
@@ -198 +199 @@
     hist.InitTitle("Sky Origin;Az [deg];Zd [deg]");
     hist.SetDrawOption("colz");
+    hist.SetAutoRange();
 
     TString sin2 = "sin(MCorsikaEvtHeader.fZd)*sin(MCorsikaRunHeader.fZdMin*TMath::DegToRad())";
@@ -346 +348 @@
     MBinning binse( 100,     1,   100000, "BinningEnergy", "log");
     MBinning binss( 100,     1, 10000000, "BinningSize",   "log");
-    MBinning binsi(  50,  -250,      250, "BinningImpact");
+    MBinning binsi( 100,  -500,      500, "BinningImpact");
     MBinning binsh( 150,     0,       50, "BinningHeight");
     MBinning binsaz(720,  -360,      360, "BinningAz");
@@ -352 +354 @@
     MBinning binsvc( 45,     0,        9, "BinningViewCone");
     MBinning binsew(150,     0,       50, "BinningEvtWidth");
+    MBinning binsd("BinningDistC");
+    MBinning binsd0("BinningDist");
     MBinning binstr("BinningTrigPos");
 
@@ -363 +367 @@
     plist.AddToList(&binsew);
     plist.AddToList(&binstr);
+    plist.AddToList(&binsd);
+    plist.AddToList(&binsd0);
 
     MHn mhn1, mhn2, mhn3;
@@ -660 +666 @@
     //-------------------------------------------
 
+    MGeomCam *cam = static_cast<MGeomCam*>(env2.GetCont());
+
     if (binstr.IsDefault())
         binstr.SetEdgesLin(150, -shape.GetPulseWidth(),
                            header.GetFreqSampling()/1000.*header.GetNumSamples()+shape.GetPulseWidth());
+
+    if (binsd.IsDefault() && cam)
+        binsd.SetEdgesLin(100, 0, cam->GetMaxRadius()*cam->GetConvMm2Deg());
+
+    if (binsd0.IsDefault() && cam)
+        binsd0.SetEdgesLin(100, 0, cam->GetMaxRadius()*cam->GetConvMm2Deg());
+
 
     header.Print();
@@ -711 +726 @@
             }
 
-            if (env2.GetCont())
+            if (cam)
             {
                 c.cd(4);
@@ -719 +734 @@
                 gPad->SetGridy();
                 gROOT->SetSelectedPad(0);
-                MHCamera *c = new MHCamera(static_cast<MGeomCam&>(*env2.GetCont()));
+                MHCamera *c = new MHCamera(*cam);
                 c->SetStats(kFALSE);
                 c->SetBit(MHCamera::kNoLegend);

trunk/MagicSoft/Mars/msimcamera/MSimAPD.cc

@@ -100 +100 @@
         *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl;
 
-        fGeom = (MGeomCam*)pList->FindCreateObj(fNameGeomCam);
+        fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
         if (!fGeom)
+        {
+            *fLog << err << "MGeomCam not found... aborting." << endl;
             return kFALSE;
+        }
     }
 

trunk/MagicSoft/Mars/msimcamera/MSimGeomCam.cc

@@ -91 +91 @@
         *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl;
 
-        fGeom = (MGeomCam*)pList->FindCreateObj(fNameGeomCam);
+        fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
         if (!fGeom)
+        {
+            *fLog << err << "MGeomCam not found... aborting." << endl;
             return kFALSE;
+        }
     }
 

trunk/MagicSoft/Mars/msimcamera/MSimRandomPhotons.cc

@@ -91 +91 @@
         *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl;
 
-        fGeom = (MGeomCam*)pList->FindCreateObj(fNameGeomCam);
+        fGeom = (MGeomCam*)pList->FindObject("MGeomCam");
         if (!fGeom)
+        {
+            *fLog << err << "MGeomCam not found... aborting." << endl;
             return kFALSE;
+        }
     }
 
@@ -175 +178 @@
             // Add a new photon
             // FIXME: SLOW!
-            MPhotonData &ph = fEvt->Add(); 
+            MPhotonData &ph = fEvt->Add();
 
             // Set source to NightSky, time to t and tag to pixel index

trunk/MagicSoft/Mars/msimreflector/MSimReflector.cc

@@ -121 +121 @@
         *fLog << inf << fNameGeomCam << " [MGeomCam] not found..." << endl;
 
-        fGeomCam = (MGeomCam*)pList->FindCreateObj(fNameGeomCam);
+        fGeomCam = (MGeomCam*)pList->FindObject("MGeomCam");
         if (!fGeomCam)
+        {
+            *fLog << err << "MGeomCam not found... aborting." << endl;
             return kFALSE;
+        }
     }