Changeset 781 for trunk/MagicSoft

Timestamp:

05/08/01 09:07:54 (24 years ago)

Author:

blanch

Message:

New numbering for branches from different trigger conditions has been
implemented. Now, they are calles: ClassName;1., ClasNema;2., ...
The MontaCarlo Headers (MMcTrigHeader and MMcFadcHeader) have been move to
the RunHeaders tree. Also the MRawRunHeader is thera with some of its
information already filled.

File:

• trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx (modified) (12 diffs)

trunk/MagicSoft/Simulation/Detector/Camera/camera.cxx

@@ -21 +21 @@
 //
 // $RCSfile: camera.cxx,v $
-// $Revision: 1.24 $
-// $Author: magicsol $ 
-// $Date: 2001-04-06 16:48:09 $
+// $Revision: 1.25 $
+// $Author: blanch $ 
+// $Date: 2001-05-08 08:07:54 $
 //
 ////////////////////////////////////////////////////////////////////////
@@ -63 +63 @@
 #include "MLons.hxx"
 
+#include "MRawRunHeader.h"
 #include "MRawEvtData.h"
 #include "MRawEvtHeader.h"
@@ -784 +785 @@
   // Prepare the raw data output
 
+       // Header Tree
+
+  MRawRunHeader **RunHeader;
+
+  RunHeader = new MRawRunHeader * [1]; 
+  RunHeader[0] = new MRawRunHeader();
+
        // Header branch
 
@@ -819 +827 @@
 
   //      create a Tree for the Header Event
-  TTree HeaderTree("McHeaders","Monte Carlo Header of Run");
+  TTree HeaderTree("RunHeaders","Headers of Run");
   
   //      define branches of Header Tree
 
   char help[4];  
+
+  HeaderTree.Branch("MRawRunHeader","MRawRunHeader",
+                    &RunHeader[0], bsize, split);
 
   if(!Trigger_Loop && Write_McTrig){
@@ -834 +845 @@
       
       sprintf(help,"%i",i+1);
-      strcpy (branchname, "MMcTrigHeader");
+      strcpy (branchname, "MMcTrigHeader;");
       strcat (branchname, & help[0]);
       strcat (branchname, ".");
@@ -851 +862 @@
       
       sprintf(help,"%i",i+1);
-      strcpy (branchname, "MMcFadcHeader");
+      strcpy (branchname, "MMcFadcHeader;");
       strcat (branchname, & help[0]);
       strcat (branchname, ".");
@@ -858 +869 @@
     }
   }  
+
+  //  Fill branches for MRawRunHeader
+
+  RunHeader[0]->SetMagicNumber(kMagicNumber);
+  RunHeader[0]->SetFormatVersion(2);
+  RunHeader[0]->SetSoftVersion((UShort_t) (VERSION*10));
+  RunHeader[0]->SetRunType(256);
+  RunHeader[0]->SetRunNumber(0);
+  RunHeader[0]->SetNumSamples(0,FADC_SLICES);
+
 
   //  Fill branches for MMcTrigHeader
@@ -957 +978 @@
       
         sprintf(help,"%i",i+1);
-        strcpy (branchname, "MMcTrig");
+        strcpy (branchname, "MMcTrig;");
         strcat (branchname, & help[0]);
         strcat (branchname, ".");
@@ -970 +991 @@
       
       sprintf(help,"%i",i+1);
-      strcpy (branchname, "MRawEvtHeader");
+      strcpy (branchname, "MRawEvtHeader;");
       strcat (branchname, & help[0]);
       strcat (branchname, ".");
@@ -979 +1000 @@
       
       sprintf(help,"%i",i+1);
-      strcpy (branchname, "MRawEvtData");
+      strcpy (branchname, "MRawEvtData;");
       strcat (branchname, & help[0]);
       strcat (branchname, ".");
@@ -3217 +3238 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.24  2001/04/06 16:48:09  magicsol
+// New camera version able to read the new format of the reflector output:
+// reflector 0.4
+//
 // Revision 1.23  2001/03/28 16:13:41  blanch
 // While feeling the MMcFadeHeader branch the boolean conditoin was wrong. It has
@@ -3269 +3294 @@
 //
 // $Log: not supported by cvs2svn $
+// Revision 1.24  2001/04/06 16:48:09  magicsol
+// New camera version able to read the new format of the reflector output:
+// reflector 0.4
+//
 // Revision 1.23  2001/03/28 16:13:41  blanch
 // While feeling the MMcFadeHeader branch the boolean conditoin was wrong. It has