Changeset 1663 for trunk

Timestamp:

11/21/02 16:15:20 (22 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft

Files:

• Mars/mfileio/MCT1ReadPreProc.cc (modified) (5 diffs)
• Mars/mfileio/MCT1ReadPreProc.h (modified) (1 diff)
• Mars/mhist/MHEnergyTheta.h (modified) (1 diff)
• Mars/mhist/MHEnergyTime.h (modified) (1 diff)
• Mars/mhist/MHMcIntRate.h (modified) (1 diff)
• Mars/mhist/MHMcRate.h (modified) (1 diff)
• include-Classes/MMcFormat/MMcEvt.hxx (modified) (1 diff)

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.cc

@@ -234 +234 @@
     *fLog << endl;
 
+    fBlinds->SetReadyToSave();
+
     /* bexcludepix[] is set TRUE (== exclude from pedestal, Laser
      * calibration and the further analysis) when the Mean value
@@ -319 +321 @@
         (*fPedest)[i].SetMeanRms(outpars.frms_pedsig_phot[i]);
 
+    fPedest->SetReadyToSave();
+
     // Used to communicate the mean over all pixels
     // pedestal RMS into the Runs NTuple, as it might
@@ -356 +360 @@
 
     fIsMcFile = outpars.bmontecarlo==TRUE;
-
-    fPedest->SetReadyToSave();
 }
 
@@ -593 +595 @@
     //  look for the source position in the camera
     //
-    fSrcPos = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam", "Source");
+    fSrcPos = (MSrcPosCam*)pList->FindCreateObj("MSrcPosCam");
     if (!fSrcPos)
         return kFALSE;
@@ -677 +679 @@
     // int ipreproc_az_arcs;  // "should be" az according to preproc (arcseconds)
 
-    fMcEvt->SetTheta(TMath::Pi()*(0.5-1./180*event.ialt_arcs/3600));   // altitude (arcseconds)
-    fMcEvt->SetPhi(TMath::Pi()/180*event.iaz_arcs/3600);               // azimuth (arcseconds)
-
+    fMcEvt->Fill(0, /*fEvtNum*/
+                 fIsMcFile ? event.imcparticle : 0, /*corsika particle type*/
+                 fIsMcFile ? event.fmcenergy_tev*1000 : 0,
+                 0, /* fThi0 */
+                 0, /* fFirTar */
+                 0, /* fzFirInt */
+                 0, /* fThet*/
+                 0, /* fPhii */
+                 0, /* fCorD */
+                 0, /* fCorX */
+                 0, /* fCorY */
+                 fIsMcFile ? event.imcimpact_m*100 : 0,
+                 TMath::Pi()/180*event.iaz_arcs/3600, // azimuth (arcseconds)
+                 TMath::Pi()*(0.5-1./180*event.ialt_arcs/3600), // altitude (arcseconds)
+                 0, /* fTFirst */
+                 0, /* fTLast */
+                 0, /* fL_Nmax */
+                 0, /* fL_t0 */
+                 0, /* fL_tmax */
+                 0, /* fL_a */
+                 0, /* fL_b */
+                 0, /* fL_c */
+                 0, /* fL_chi2 */
+                 0, /* uiPin */
+                 0, /* uiPat */
+                 0, /* uiPre */
+                 0, /* uiPco */
+                 0, /* uiPelS */
+                 fIsMcFile ? event.fmcsize_phel : 0 /* uiPelC, Simulated SIZE */
+                 );
+
+    fMcTrig->SetFirstLevel(event.imctriggerflag);    // MC data from Dorota get a triggerflag: 1 means triggered, 0 not. */
+
+    fMcTrig->SetReadyToSave();
     fMcEvt->SetReadyToSave();
-
-    if (!fIsMcFile)
-        return;
-
-    fMcEvt->SetPartId(event.imcparticle);        // corsika particle type
-    fMcEvt->SetEnergy(event.fmcenergy_tev*1000); // simulated energy
-    fMcEvt->SetImpact(event.imcimpact_m*100);    // simulated impact
-
-    fMcTrig->SetFirstLevel(event.imctriggerflag);    // MC data from Dorota get a triggerflag: 1 means triggered, 0 not. */
-    fMcTrig->SetReadyToSave();
-
-    //float fmcsize_phel;   // Simulated SIZE
 }
 

trunk/MagicSoft/Mars/mfileio/MCT1ReadPreProc.h

@@ -66 +66 @@
     UInt_t GetEntries() { return fEntries; }
 
-    ClassDef(MCT1ReadPreProc, 0)        // Reads the CT1 data file
+    ClassDef(MCT1ReadPreProc, 0) // Reads the CT1 preproc data file
 };
 

trunk/MagicSoft/Mars/mhist/MHEnergyTheta.h

@@ -40 +40 @@
     }
 
-    ClassDef(MHEnergyTheta, 1)  // Data Container to calculate Collection Area
+    ClassDef(MHEnergyTheta, 1)  // Histogram: Energy vs. Theta
 };
 

trunk/MagicSoft/Mars/mhist/MHEnergyTime.h

@@ -41 +41 @@
     }
 
-    ClassDef(MHEnergyTime, 1)  // Data Container to calculate Collection Area
+    ClassDef(MHEnergyTime, 1)  // Histogram: Energy vs. Time
 };
 

trunk/MagicSoft/Mars/mhist/MHMcIntRate.h

@@ -36 +36 @@
     void Calc(const MHMcDifRate &rate);
 
-    ClassDef(MHMcIntRate, 1)  // Histogram container for montecarlo energy threshold
+    ClassDef(MHMcIntRate, 1)  // Histogram container for integral event rate
 };
 

trunk/MagicSoft/Mars/mhist/MHMcRate.h

@@ -59 +59 @@
     TObject *DrawClone(Option_t *o=NULL) const;
 
-    ClassDef(MHMcRate, 1)  // Data Container to calculate Collection Area
+    ClassDef(MHMcRate, 1)  // Data Container to calculate trigger rate
 };
 

trunk/MagicSoft/include-Classes/MMcFormat/MMcEvt.hxx

@@ -95 +95 @@
 /*    UInt_t GetPhotElinCamera() { return fPhotElinCamera; }             //Get Passed qe total*/
 
+  Float_t GetTelescopePhi() const { return fTelescopePhi; }
+  Float_t GetTelescopeTheta() const { return fTelescopeTheta; }
 
   void SetPartId(Short_t PartId)