Changeset 1240 for trunk/MagicSoft

Timestamp:

03/13/02 18:16:36 (23 years ago)

Author:

blanch

Message:

Some new variables have been introduced in the MMcRunHeader. It has been checked that the compatibility with old files is kept.

File:

• trunk/MagicSoft/include-Classes/MMcFormat/MMcRunHeader.cxx (modified) (4 diffs)

trunk/MagicSoft/include-Classes/MMcFormat/MMcRunHeader.cxx

@@ -50 +50 @@
     fTitle = title ? title : "Raw Run Header Information";
 
+    fMcRunNumber =0;
+    fProductionSite = 0;
+    fDateRunMMCs = 0;
+    fDateRunCamera = 0;
     fNumTrigCond = 0;
     fAllEvtsTriggered = 0 ;
@@ -55 +59 @@
     fMcTrig = 0;
     fMcFadc = 0;
+    fRawEvt = 0;
+    fElecNoise = 0;
+    fStarFieldRotate = 0;
     fNumAnalisedPixels = 0;
     fNumSimulatedShowers = 0;
@@ -76 +83 @@
     fShowerPhiMin = 0.0;
 
+    fCWaveLower = 0.0;
+    fCWaveUpper = 0.0;
+
+    fNumObsLev = 0;
+    for (int i=0; i<10; i++){
+      fHeightLev[i]=0.0;
+    }
+    fSlopeSpec = 0.0;
+
     fCorsikaVersion = 0;
     fReflVersion = 0;
@@ -95 +111 @@
 // Fill. Put data in the container
 //
-void MMcRunHeader::Fill(const UInt_t numtrigcond,
-                        const Byte_t fallevts,
-                        const Byte_t fmcevt,
-                        const Byte_t fmctrig,
-                        const Byte_t fmcfadc,
-                        const Int_t  fnumanalpixels,
-                        const UInt_t fnumsim,
-                        const UInt_t fnumsto,
-                        const Int_t fsfRaH,
-                        const Int_t fsfRaM,
-                        const Int_t fsfRaS,
-                        const Int_t fsfDeD,
-                        const Int_t fsfDeM,
-                        const Int_t fsfDeS,
-                        const Float_t fnumdnsb,
-                        const Float_t ftelestheta,
-                        const Float_t ftelesphi,
-                        const Float_t fsofftheta,
-                        const Float_t fsoffphi,
-                        const Float_t fshthetamax,
-                        const Float_t fshthetamin,
-                        const Float_t fshphimax,
-                        const Float_t fshphimin,
-                        const UInt_t fcorsika,
-                        const UInt_t frefl,
-                        const UInt_t fcam
-    ){
+void MMcRunHeader::Fill(const Float_t  runnumber,
+                        const UInt_t   productionsite,
+                        const Float_t  daterunMMCs,
+                        const Float_t   daterunCamera,
+                        const UInt_t   numtrigcond,
+                        const Byte_t   allevts,
+                        const Byte_t   mcevt,
+                        const Byte_t   mctrig,
+                        const Byte_t   mcfadc,
+                        const Byte_t   rawevt,
+                        const Byte_t   elecnoise, 
+                        const Int_t    numanalpixels,
+                        const UInt_t   numsim,
+                        const UInt_t   numsto,
+                        const Byte_t   starfieldrotate,
+                        const Int_t    sfRaH,
+                        const Int_t    sfRaM,
+                        const Int_t    sfRaS,
+                        const Int_t    sfDeD,
+                        const Int_t    sfDeM,
+                        const Int_t    sfDeS,
+                        const Float_t  numdnsb,
+                        const Float_t  telestheta,
+                        const Float_t  telesphi,
+                        const Float_t  sofftheta,
+                        const Float_t  soffphi,
+                        const Float_t  shthetamax,
+                        const Float_t  shthetamin,
+                        const Float_t  shphimax,
+                        const Float_t  shphimin,
+                        const Float_t  cwavelower,
+                        const Float_t  cwaveupper,
+                        const Float_t  slopespec,
+                        const UInt_t   numObslev,
+                        const Float_t  heightlev[10],
+                        const UInt_t   corsika,
+                        const UInt_t   refl,
+                        const UInt_t   cam)
+{
+    fMcRunNumber =runnumber;
+    fProductionSite = productionsite;
+    fDateRunMMCs = daterunMMCs;
+    fDateRunCamera = daterunCamera;
     fNumTrigCond = numtrigcond;
-    fAllEvtsTriggered = fallevts;
-    fMcEvt = fmcevt;
-    fMcTrig = fmctrig;
-    fMcFadc = fmcfadc;
-    fNumAnalisedPixels = fnumanalpixels;
-    fNumSimulatedShowers = fnumsim;
-    fNumStoredShowers = fnumsto;
-
-    fStarFieldRaH = fsfRaH;
-    fStarFieldRaM = fsfRaM;
-    fStarFieldRaS = fsfRaS;
-    fStarFieldDeD = fsfDeD;
-    fStarFieldDeM = fsfDeM;
-    fStarFieldDeS = fsfDeS;
-
-    fNumPheFromDNSB = fnumdnsb;
-    fTelesTheta = ftelestheta;
-    fTelesPhi = ftelesphi;
-    fSourceOffsetTheta = fsofftheta; 
-    fSourceOffsetPhi = fsoffphi;
-    fShowerThetaMax = fshthetamax;
-    fShowerThetaMin = fshthetamin;
-    fShowerPhiMax = fshphimax;
-    fShowerPhiMin = fshphimin;
-
-    fCorsikaVersion = fcorsika;
-    fReflVersion = frefl;
-    fCamVersion = fcam;
+    fAllEvtsTriggered = allevts;
+    fMcEvt = mcevt;
+    fMcTrig = mctrig;
+    fMcFadc = mcfadc;
+    fRawEvt = rawevt;
+    fElecNoise = elecnoise;
+    fStarFieldRotate = starfieldrotate;
+    fNumAnalisedPixels = numanalpixels;
+    fNumSimulatedShowers = numsim;
+    fNumStoredShowers = numsto;
+
+    fStarFieldRaH = sfRaH;
+    fStarFieldRaM = sfRaM;
+    fStarFieldRaS = sfRaS;
+    fStarFieldDeD = sfDeD;
+    fStarFieldDeM = sfDeM;
+    fStarFieldDeS = sfDeS;
+
+    fNumPheFromDNSB = numdnsb;
+    fTelesTheta = telestheta;
+    fTelesPhi = telesphi;
+    fSourceOffsetTheta = sofftheta; 
+    fSourceOffsetPhi = soffphi;
+    fShowerThetaMax = shthetamax;
+    fShowerThetaMin = shthetamin;
+    fShowerPhiMax = shphimax;
+    fShowerPhiMin = shphimin;
+
+    fCWaveLower = cwavelower;
+    fCWaveUpper = cwaveupper;
+
+    fNumObsLev = numObslev;
+    for (UInt_t i=0; i<numObslev; i++){
+      fHeightLev[i]=heightlev[i];
+    }
+    fSlopeSpec = slopespec;
+
+    fCorsikaVersion = corsika;
+    fReflVersion = refl;
+    fCamVersion = cam;
+    
 }