Changeset 9595 for trunk/MagicSoft/Mars

Timestamp:

06/24/10 15:05:04 (14 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• NEWS (modified) (2 diffs)
• ceres.cc (modified) (3 diffs)
• mcorsika/MCorsikaRunHeader.h (modified) (1 diff)
• mpointing/MPointingDevCalc.cc (modified) (1 diff)
• msim/MSimMMCS.cc (modified) (4 diffs)
• showplot.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -33 +33 @@
      - changed interpretation from file from radius to diameter
 
+   * ceres.cc:
+     - added option --run-number
+
+   * showplot.cc:
+     - set default palette to pretty palette
+
+   * mcorsika/MCorsikaRunHeader.h:
+     - added getter for ViewConeInnerAngle
+
+   * mmc/MMcCorsikaRunHeader.h:
+     - added HasViewCone
+     - added SetViewCone
+
+   * mmc/MMcEvt.cxx, mmc/MMcEvtBasic.h:
+     - moved fPhi and fTheta from MMcEvt to MMcEvtBasic
+     - increased class version number accordingly
+     - moved setter
+     - moved getter
+     - adapted Clean()
+     - adapter copy-constructor
+
+   * mpointing/MPointingDevCalc.cc:
+     - added some comments
+
+   * msim/MSimMMCS.cc:
+     - transfer view cone data
+     - set run-info (run/file-number) according to new scheme
+     - always set MMcEvt::fPhi/fTheta to particle direction
+
 
 

trunk/MagicSoft/Mars/NEWS

@@ -15 +15 @@
      objects and TCanvas' but no MStatusArray object has been improved.
 
+   * MMcEvt.fPhi and MMcEvt.fTheta have been moved to its base class
+     MMcEvtBasic. Consequently, the direction of the primary shower
+     is not lost in the OriginalMC tree anymore
+
  ;ceres:
 
@@ -29 +33 @@
    * The number of photons in the calibration signal is now distributed
      by a possonian instead of a Gauss.
+
+   * implemented new file-naming scheme (corsika run-number is new
+     tranfered to the ceres output as file-number). Therefore a new option
+     has been implemented to set an artificial run-number:
+        ---run-number=12345
 
 

trunk/MagicSoft/Mars/ceres.cc

@@ -71 +71 @@
     gLog << "   --mode=pedestal           Execution mode. Produce either pedestals," << endl;
     gLog << "   --mode=calibration        calibration data (no input files required) or" << endl;
-    gLog << "   --mode=data               process data files [default]" << endl;
+    gLog << "   --mode=data               process data files [default]" << endl << endl;
+    gLog << "   --run-number=#            Optionally set the run number of the run to simulate" << endl << endl;
     gLog << endl;
 //    gLog << "     -f:  force reading of runheader" << endl;
@@ -166 +167 @@
     const TString kOutpath    = arg.GetStringAndRemove("--out=", ".");
 
+    const Int_t   kRunNumber  = arg.GetIntAndRemove("--run-number=", -1);
+
     const TString kOpMode     = arg.GetStringAndRemove("--mode=", "data");
 
@@ -342 +345 @@
         job.SetMode(opmode);
         job.SetCommandLine(MArgs::GetCommandLine(argc, argv));
+        job.SetRunNumber(kRunNumber);
+
         // job.SetPathIn(kInpath); // not yet needed
 

trunk/MagicSoft/Mars/mcorsika/MCorsikaRunHeader.h

@@ -98 +98 @@
     Float_t GetMagneticFieldAz() const { return fMagneticFieldAz; }
 
+    Float_t GetViewConeInnerAngle() const { return fViewConeInnerAngle; }
     Float_t GetViewConeOuterAngle() const { return fViewConeOuterAngle; }
     Bool_t HasViewCone() const { return fViewConeOuterAngle>0; }

trunk/MagicSoft/Mars/mpointing/MPointingDevCalc.cc

@@ -282 +282 @@
 // New LUTs for M2
 //
+// [2010-06-14 M. Garcz.]
+//
+// New LUTs for M1
+//
 //
 // Others

trunk/MagicSoft/Mars/msim/MSimMMCS.cc

@@ -122 +122 @@
     mch->SetSpectrum(fRunHeader->GetSlopeSpectrum(),
                      fRunHeader->GetEnergyMin(), fRunHeader->GetEnergyMax());
+    mch->SetViewCone(fRunHeader->GetViewConeInnerAngle(),
+                     fRunHeader->GetViewConeOuterAngle());
     mch->SetReadyToSave();
 
@@ -147 +149 @@
 
     // FIXME: Is there a way to write them as LAST entry in the file?
-    rh->SetRunInfo(1, fRunHeader->GetRunNumber(), 0);
+    rh->SetFileNumber(fRunHeader->GetRunNumber()%1000);
     rh->SetSourceInfo(MMcEvtBasic::GetParticleName(id));
     rh->SetReadyToSave();
@@ -160 +162 @@
 // --------------------------------------------------------------------------
 //
+// We have two scenarios for the ponting:
+//
+//  1) Diffuse flux (view cone option)
+//
+//     Azimuth and Zenith angle are fixed values (min==max).
+//     The diffuse flux is produced in a cone around this angle.
+//
+//     That means that the telescope orientation is aligned and fixed
+//     along the cone axis.
+//
+//     To analyse a diffuse flux the source position should be fixed to
+//     the camera center.
+//     In some cases (e.g. training of RF) the source depending parameters
+//     might be needed w.r.t. the real origin of the primary particle.
+//     In this case the primary shower direction is needed.
+//
+//  2) Directed flux
+//
+//     Particles are produced between a min and max Azimuth and Zenith angle.
+//     The telescope axis is either parallel (on source) or off axis
+//     (wobble) to the primary particle direction.
+//     This is used to "fake" the trajectory of the source.
+//
+//  3) Flux along a trajectory
+//
+//     [...]
+//
 Int_t MSimMMCS::Process()
 {
@@ -165 +194 @@
     fMcEvtBasic->SetImpact(fEvtHeader->GetImpact());
 
+    // Pointing direction of the telescope (telescope axis)
     fMcEvtBasic->SetTelescopeTheta(fPointingTel->GetZdRad());
     fMcEvtBasic->SetTelescopePhi(fPointingTel->GetAzRad());
 
-    fMcEvtBasic->SetReadyToSave();
-
-    static_cast<MMcEvtBasic&>(*fMcEvt) = *fMcEvtBasic;
-
+    // Direction of primary particle
     // Convert from corsika frame to telescope frame, taking
     // the magnetic field into account: tel = corsika+offset
-    if (fRunHeader->HasViewCone())
-    {
-        fMcEvt->SetTheta(fPointingTel->GetZdRad());
-        fMcEvt->SetPhi(fPointingTel->GetAzRad());
-    }
-    else
-    {
-        fMcEvt->SetTheta(fEvtHeader->GetZd());
-        fMcEvt->SetPhi(fEvtHeader->GetAz()+fRunHeader->GetMagneticFieldAz());
-    }
+    fMcEvtBasic->SetParticleTheta(fEvtHeader->GetZd());
+    fMcEvtBasic->SetParticlePhi(fEvtHeader->GetAz()+fRunHeader->GetMagneticFieldAz());
+
+    fMcEvtBasic->SetReadyToSave();
+
+
+    static_cast<MMcEvtBasic&>(*fMcEvt) = *fMcEvtBasic;
+
 
     fMcEvt->SetEvtNumber(fEvtHeader->GetEvtNumber());

trunk/MagicSoft/Mars/showplot.cc

@@ -1 +1 @@
 #include <TROOT.h>
 #include <TClass.h>
+#include <TStyle.h>
 #include <TGClient.h>
 #include <TRint.h>
@@ -245 +246 @@
         return 1;
     }
+
+    gStyle->SetPalette(1, 0);
 
     //