add cross section and fix branch names

Author: tobias-boeckh

Pinpoint/convertGHEPPinPoint.C

@@ -156,6 +156,7 @@ void convertGHEPPinPoint(const std::string& inputFilename, const std::string& ou
   double W;
   double x;
   double y;
+  double Xsec;
   double crossingAngle;
   bool isVerticalCrossingAngle;
   // to do: add interaction information
@@ -198,6 +199,7 @@ void convertGHEPPinPoint(const std::string& inputFilename, const std::string& ou
   outTree->Branch("W",&W,"W/D");
   outTree->Branch("x",&x,"x/D");
   outTree->Branch("y",&y,"y/D");
+  outTree->Branch("XSec", &Xsec, "XSec/D");
   outTree->Branch("crossingAngle",&crossingAngle,"crossingAngle/D");
   outTree->Branch("isVerticalCrossingAngle",&isVerticalCrossingAngle,
                   "isVerticalCrossingAngle/O");
@@ -299,6 +301,8 @@ void convertGHEPPinPoint(const std::string& inputFilename, const std::string& ou
 
     // Hit nucleon
     hitnuc = (hitnucl) ? hitnucl->Pdg() : 0;
+
+    Xsec  = event.XSec() * (1E+38/units::cm2);
 
     // Process type
     cc = proc_info.IsWeakCC();

Pinpoint/include/generators/GFaserGenerator.hh

@@ -46,6 +46,7 @@ class GFaserGenerator : public GeneratorBase
     int fIntType, fScatType;
     bool fIsCc, fIsNc;
     int fTgtZ, fTgtA, fTgtPdg;
+    double xsec;
 
     std::vector<std::string>* fName = nullptr;
     std::vector<int>* fPdgc = nullptr;

Pinpoint/src/generators/GFaserGenerator.cc

@@ -97,15 +97,16 @@ void GFaserGenerator::LoadData()
   fGfaserTree->SetBranchAddress("W", &fW);
   fGfaserTree->SetBranchAddress("x", &fX);
   fGfaserTree->SetBranchAddress("y", &fY);
+  fGfaserTree->SetBranchAddress("xsec", &xsec);
   fGfaserTree->SetBranchAddress("intType", &fIntType);
   fGfaserTree->SetBranchAddress("scatteringType", &fScatType);
   fGfaserTree->SetBranchAddress("cc", &fIsCc);
   fGfaserTree->SetBranchAddress("nc", &fIsNc);
   fGfaserTree->SetBranchAddress("Z", &fTgtZ);
   fGfaserTree->SetBranchAddress("A", &fTgtA);
-  fGfaserTree->SetBranchAddress("tgt_pdg", &fTgtPdg);
-  fGfaserTree->SetBranchAddress("nu_pdg", &fNuPdg);
-  fGfaserTree->SetBranchAddress("lepton_pdg", &fLeptonPdg);
+  fGfaserTree->SetBranchAddress("tgt", &fTgtPdg);
+  fGfaserTree->SetBranchAddress("neu", &fNuPdg);
+  fGfaserTree->SetBranchAddress("fspl", &fLeptonPdg);
   fGfaserTree->SetBranchAddress("hitnuc", &fHitPdg);
 
   fCurrentEvent = fFirstEvent;
@@ -186,6 +187,7 @@ void GFaserGenerator::GeneratePrimaries(G4Event* event)
   metadata.xBj = fX;
   metadata.y = fY;
   metadata.W = fW;
+  metadata.xs = xsec;
   fVertexMetadata.push_back(metadata);
 
   fCurrentEvent++;