Context Navigation

Changeset 9422 for trunk

Timestamp:

04/16/09 10:46:32 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

-              r9420
+              r9422
                                                  -*-*- END OF LINE -*-*-
+/04/16 Thomas Bretz
+   * mbase/MEvtLoop.cc:
+     - make sure that no negative values for the estimated time
+       is shown
+   * mcorsika/MCorsikaEvtHeader.cc:
+     - calculate impact in the telescope dish plane and not on the
+       ground
+   * mhflux/MHCollectionArea.cc:
+     - initialize more variables in the constructor as suggested
+       by valgrind
+   * mpointing/MHPointing.cc:
+     - set the maximum such that both axis are scaled correctly
+   * msimcamera/MSimBundlePhotons.cc:
+     - added some more output
+   * resmc/dwarf-pde-gapd.txt:
+     - used new curve from ETH
+     - extrapolated curve on both ends linearily
+   * resmc/dwarf-reflectivity.txt:
+     - extrapolated linearily to 980 nm
+   * resmc/magic-pde.txt:
+     - set to 0 at 900nm
+   * resmc/magic-reflectivity.txt:
+     - extrpolated to 900nm
 /04/01 Thomas Bretz
 …
      - added a cut "Cut" after image parameter calculation
      - updated noise numbers
+   * resmc/dwarf-pde-gapd.txt:
+     - upadted with a more reliable curve from theeth meeting page
+       (linear extrapolate below 350nm)

-              r9420
+              r9422
    * Added the possibility to add a cut after the image parameter
      calculation (''Cut'')
+   * updated the PDE of the GAPDs with a more reliable curve from
+     the meeting page (linear extrapolate below 350nm)
+   * The impact distribution in the event distrbutions is now
+     perpendicular to Alt/Az and the histogram is displayed in 1D
+   * The GAPD PDE has been updated
+   * PDEs and mirror reflectivities have been linearily extrapolated
+     to match the wavelegth range between 290nm and 900nm
  ;callisto:

r9207	r9422
376	376	txt += (Int_t)speed;
377	377	txt += "Evts/s";
378		if (fNumEvents>0)
	378	if (fNumEvents>0 && (Int_t)fNumEvents-num>0)
379	379	{
380	380	txt += ", est: ";

-              r9374
+              r9422
 // --------------------------------------------------------------------------
 //
+//  Return Hypot(x, y)
+// Return Impact (distance of ground incident point from telescope axis)
+//
+// Distance d between a point q and a line u (via p):
+//   d = | ( vec(q) - vec(p) ) x vec(u) |  /  | vec(u) |
+//
+// If p = 0
+//
+//   ==>   d = | vec(q) x vec(u) |  /  | vec(u) |
+//          w :=  q = (x/y/0)
+//          v :=  u = (Alt/Az)
+//
+// For Alt/Az = Theta/Phi:
+//
+//  x = r sin(theta) cos(phi)
+//  y = r sin(theta) sin(phi)
+//  z = r cos(theta)
+//
+//                   (   -q3*u2    )   ( -cos(theta)*y                                     )
+// vec(q) x vec(u) = (    q3*u1    ) = (  cos(theta)*x                                     )
+//                   ( q1*u2-q2*u1 )   ( sin(theta) cos(phi) * y - sin(theta) sin(phi) * x )
+//
+//   ==> d = sqrt( cos(theta)^2 (x^2  + y^2 ) +
+//                 sin(theta)^2 ( cos(phi) y + sin(phi) x)^2 )
 //
 Double_t MCorsikaEvtHeader::GetImpact() const
+{
+    return TMath::Hypot(fX, fY);
+    const Double_t c = TMath::Cos(fZd);
+    const Double_t s = TMath::Sin(fZd);
+    const Double_t p = TMath::Cos(fAz)*fX - TMath::Sin(fAz)*fY;
+    return TMath::Sqrt(c*c*(fX*fX + fY*fY) + s*s* p*p);
+}

-              r9375
+              r9422
 //
 MHCollectionArea::MHCollectionArea(const char *name, const char *title)
+  : fMcEvt(0), fHeader(0), fMcAreaRadius(-1), fIsExtern(kFALSE)
+    : fMcEvt(0), fHeader(0), fMcAreaRadius(-1),
+    fTotalNumSimulatedShowers(0), fAllEvtsTriggered(kFALSE),
+    fIsExtern(kFALSE)
+{
     //   initialize the histogram for the distribution r vs E

-              r9153
+              r9422
     if (fDevTimeCosy.GetN()>0)
         fDevTimeCosy.SetMinimum(0);
     if (fBrightness.GetN()>0)
+    {
         fBrightness.SetMinimum(0);
+        fBrightness.SetMaximum(95);
+    }
     if (fNumStars.GetN()>0)
+    {
         fNumStars.SetMinimum(0);
+        fNumStars.SetMaximum(95);
+    }
     if (fNumStarsCor.GetN()>0)
+    {
         fNumStarsCor.SetMinimum(0);
+        fNumStarsCor.SetMaximum(95);
+    }
     DrawGraph(fDevTimeSG,   "\\Delta [arcmin]");

-              r9318
+              r9422
     // Make sure that each line has exactly one row
     if (!fLut.HasConstantLength() && fLut.GetMaxEntries()!=1)
+        return kFALSE;
+    {
+        *fLog << err << fFileName << " wrongly formatted." << endl;
+        return kFALSE;
+    }
     *fLog << inf << "Using look-up table from " << fFileName << endl;

-              r9318
+              r9422
+    }
+    // Get Number of pixels
+    const UInt_t npix = fData->GetNumPixels();
+    if (npix!=fCamera->GetNumChannels())
+    // Make sure that we have not more analog channels than pixels
+    // FIXME: Is this really necessary?
+    if (fCamera->GetNumChannels()>fData->GetNumPixels())
+    {
         *fLog << err;
         *fLog << "ERROR - Number of analog channels " << fCamera->GetNumChannels();
         *fLog << " doesn't match number of pixels " << fData->GetNumPixels() << endl;
+        *fLog << " exceeds number of pixels " << fData->GetNumPixels() << endl;
         return kERROR;
+    }
 …
     // Digitize into a buffer
     MArrayI buffer(nslices*npix);
+    MArrayI buffer(nslices*fData->GetNumPixels());
     // Loop over all channels/pixels
     for (UInt_t i=0; i<npix; i++)
+    for (UInt_t i=0; i<fCamera->GetNumChannels(); i++)
+    {
         // Get i-th canalog hannel

-              r9378
+              r9422
+0.05
+0.16
+0.30
+0.40
+0.35
+0.28
+0.20
+0.17
+0.18
+0.13
+0.04
+0
+0.14
+0.2483
+.655 0.272855
+.359 0.30322
+.682 0.328166
+0.3427
+0.36
+0.3791
+.652 0.394688
+0.4056
+0.4111
+0.4132
+.397 0.413991
+0.4125
+.328 0.409247
+0.4052
+.192 0.397064
+0.3869
+0.3736
+0.3634
+0.35
+0.3368
+0.325
+0.3114
+0.2987
+0.2847
+0.2726
+.74 0.261643
+.822 0.250952
+.905 0.241449
+.987 0.22957
+0.2192
+0.2099
+0.2028
+0.1933
+0.1847
+0.1778
+0.1699
+0.1616
+0.1526
+0.1464
+0.138
+0.1308
+0.1232
+0.1158
+.399 0.0751422
+0

Note: See TracChangeset for help on using the changeset viewer.