diff --git a/NPLib/Charissa/Makefile b/NPLib/Charissa/Makefile
index 09e504d2ca952884b4ed5e31ff644a09e8bf32f4..b0dd77cd7d857d4b2abdd7a5458bbb85c0256c72 100644
--- a/NPLib/Charissa/Makefile
+++ b/NPLib/Charissa/Makefile
@@ -10,7 +10,7 @@ all: $(SHARELIB)
## MUST2 ##
#libCharissa.so: TCharissaData.o TCharissaDataDict.o TCharissaPhysics.o TCharissaPhysicsDict.o TCharissaSpectra.o
-libCharissa.so: TCharissaData.o TCharissaDataDict.o
+libCharissa.so: TCharissaData.o TCharissaDataDict.o TCharissaSpectra.o
$(LD) $(SOFLAGS) $^ $(OutPutOpt) $@
TCharissaDataDict.cxx: TCharissaData.h
diff --git a/NPLib/Charissa/TCharissaSpectra.cxx b/NPLib/Charissa/TCharissaSpectra.cxx
new file mode 100644
index 0000000000000000000000000000000000000000..f0bf4a164a9e458215a8b21c92b8f97b1d396bc4
--- /dev/null
+++ b/NPLib/Charissa/TCharissaSpectra.cxx
@@ -0,0 +1,597 @@
+/*****************************************************************************
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
+ * *
+ * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
+ * For the list of contributors see $NPTOOL/Licence/Contributors *
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Original Author: N. de Sereville contact address: deserevi@ipno.in2p3.fr *
+ * *
+ * Creation Date : dec 2013 *
+ * Last update : *
+ *---------------------------------------------------------------------------*
+ * Decription: *
+ * This class holds all the online spectra needed for Charissa *
+ * *
+ *---------------------------------------------------------------------------*
+ * Comment: *
+ * + first version (not complete yet) *
+ * *
+ * *
+ *****************************************************************************/
+
+// NPL
+#include "TCharissaSpectra.h"
+#include "NPOptionManager.h"
+#include "NPGlobalSystemOfUnits.h"
+#include "NPPhysicalConstants.h"
+#ifdef NP_SYSTEM_OF_UNITS_H
+using namespace NPUNITS;
+#endif
+
+
+// ROOT
+#include "TString.h"
+#include "TDirectory.h"
+#include "TFile.h"
+
+
+////////////////////////////////////////////////////////////////////////////////
+TCharissaSpectra::TCharissaSpectra()
+{
+ fNumberOfTelescope = 0;
+ fStripX = 16;
+ fStripY = 16;
+ fCrystalCsI = 1;
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+TCharissaSpectra::TCharissaSpectra(unsigned int NumberOfTelescope)
+{
+ if(NPOptionManager::getInstance()->GetVerboseLevel()>0)
+ cout << "************************************************" << endl
+ << "TCharissaSpectra : Initalising control spectra for "
+ << NumberOfTelescope << " Telescopes" << endl
+ << "************************************************" << endl ;
+
+ fNumberOfTelescope = NumberOfTelescope;
+ fStripX = 16;
+ fStripY = 16;
+ fCrystalCsI = 1;
+
+ InitRawSpectra();
+ InitPreTreatedSpectra();
+ InitPhysicsSpectra();
+}
+
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+TCharissaSpectra::~TCharissaSpectra(){
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+void TCharissaSpectra::InitRawSpectra()
+{
+ TString name;
+
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) { // loop on number of detectors
+ // L1_STRX_E_RAW
+ name = Form("CHA%d_L1_STRX_E_RAW", i+1);
+ AddHisto2D(name, name, fStripX, 1, fStripX+1, 512, 0, 16384, "CHARISSA/RAW/STRXE");
+
+ // L1_STRY_E_RAW
+ name = Form("CHA%d_L1_STRY_E_RAW", i+1);
+ AddHisto2D(name, name, fStripY, 1, fStripY+1, 512, 0, 16384, "CHARISSA/RAW/STRYE");
+
+ // L2_STRX_E_RAW
+ name = Form("CHA%d_L2_STRX_E_RAW", i+1);
+ AddHisto2D(name, name, fStripX, 1, fStripX+1, 512, 0, 16384, "CHARISSA/RAW/STRXE");
+
+ // L2_STRY_E_RAW
+ name = Form("CHA%d_L2_STRY_E_RAW", i+1);
+ AddHisto2D(name, name, fStripY, 1, fStripY+1, 512, 0, 16384, "CHARISSA/RAW/STRYE");
+
+ // CSI_E_RAW
+ name = Form("CHA%d_CSI_E_RAW", i+1);
+ AddHisto2D(name, name, fCrystalCsI, 1, fCrystalCsI+1, 512, 0, 16384, "CHARISSA/RAW/CSIE");
+
+ // L1_STRX_RAW_MULT
+ name = Form("CHA%d_L1_STRX_RAW_MULT", i+1);
+ AddHisto1D(name, name, fStripX, 1, fStripX+1, "CHARISSA/RAW/MULT");
+
+ // L1_STRY_RAW_MULT
+ name = Form("CHA%d_L1_STRY_RAW_MULT", i+1);
+ AddHisto1D(name, name, fStripX, 1, fStripX+1, "CHARISSA/RAW/MULT");
+
+ // L2_STRX_RAW_MULT
+ name = Form("CHA%d_L2_STRX_RAW_MULT", i+1);
+ AddHisto1D(name, name, fStripX, 1, fStripX+1, "CHARISSA/RAW/MULT");
+
+ // L2_STRY_RAW_MULT
+ name = Form("CHA%d_L2_STRY_RAW_MULT", i+1);
+ AddHisto1D(name, name, fStripX, 1, fStripX+1, "CHARISSA/RAW/MULT");
+
+ // CSI_RAW_MULT
+ name = Form("CHA%d_CSI_RAW_MULT", i+1);
+ AddHisto1D(name, name, fCrystalCsI, 1, fCrystalCsI+1, "CHARISSA/RAW/MULT");
+ } // end loop on number of detectors
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+void TCharissaSpectra::InitPreTreatedSpectra()
+{
+ TString name;
+
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) { // loop on number of detectors
+ // L1_STRX_E_CAL
+ name = Form("CHA%d_L1_STRX_E_CAL", i+1);
+ AddHisto2D(name, name, fStripX, 1, fStripX+1, 500, 0, 50, "CHARISSA/CAL/STRXE");
+
+ // L1_STRY_E_CAL
+ name = Form("CHA%d_L1_STRY_E_CAL", i+1);
+ AddHisto2D(name, name, fStripY, 1, fStripY+1, 500, 0, 50, "CHARISSA/CAL/STRYE");
+
+ // L2_STRX_E_CAL
+ name = Form("CHA%d_L2_STRX_E_CAL", i+1);
+ AddHisto2D(name, name, fStripX, 1, fStripX+1, 500, 0, 50, "CHARISSA/CAL/STRXE");
+
+ // L2_STRY_E_CAL
+ name = Form("CHA%d_L2_STRY_E_CAL", i+1);
+ AddHisto2D(name, name, fStripY, 1, fStripY+1, 500, 0, 50, "CHARISSA/CAL/STRYE");
+
+ // CSI_E_CAL
+ name = Form("CHA%d_CSI_E_CAL", i+1);
+ AddHisto2D(name, name, fCrystalCsI, 1, fCrystalCsI+1, 500, 0, 50, "CHARISSA/CAL/CSIE");
+
+ // STRX_L1_CAL_MULT
+ name = Form("CHA%d_L1_STRX_CAL_MULT", i+1);
+ AddHisto1D(name, name, fStripX, 1, fStripX+1, "CHARISSA/CAL/MULT");
+
+ // STRY_L1_CAL_MULT
+ name = Form("CHA%d_L1_STRY_CAL_MULT", i+1);
+ AddHisto1D(name, name, fStripX, 1, fStripX+1, "CHARISSA/CAL/MULT");
+
+ // STRX_L2_CAL_MULT
+ name = Form("CHA%d_L2_STRX_CAL_MULT", i+1);
+ AddHisto1D(name, name, fStripX, 1, fStripX+1, "CHARISSA/CAL/MULT");
+
+ // STRY_L2_CAL_MULT
+ name = Form("CHA%d_L2_STRY_CAL_MULT", i+1);
+ AddHisto1D(name, name, fStripX, 1, fStripX+1, "CHARISSA/CAL/MULT");
+
+ // CSI_CAL_MULT
+ name = Form("CHA%d_CSI_CAL_MULT", i+1);
+ AddHisto1D(name, name, fCrystalCsI, 1, fCrystalCsI+1, "CHARISSA/CAL/MULT");
+ } // end loop on number of detectors
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+void TCharissaSpectra::InitPhysicsSpectra()
+{
+ TString name;
+
+ // L1 X-Y Impact Matrix
+ name = "CHA_L1_IMPACT_MATRIX";
+ AddHisto2D(name, name, 500, -150, 150, 500, -150, 150, "CHARISSA/PHY");
+
+ // L2 X-Y Impact Matrix
+ name = "CHA_L2_IMPACT_MATRIX";
+ AddHisto2D(name, name, 500, -150, 150, 500, -150, 150, "CHARISSA/PHY");
+
+ // L1 kinematic line
+ name = "CHA_L1_THETA_E";
+ AddHisto2D(name, name, 360, 0, 180, 500, 0, 50, "CHARISSA/PHY");
+
+ // L2 kinematic line
+ name = "CHA_L2_THETA_E";
+ AddHisto2D(name, name, 360, 0, 180, 500, 0, 50, "CHARISSA/PHY");
+
+ // X-Y Energy Correlation
+ for (unsigned int i = 0 ; i < fNumberOfTelescope ; i++) { // loop on number of detectors
+ // L1
+ name = Form("CHA%d_L1_XY_COR", i+1);
+ AddHisto2D(name, name, 500, 0, 50, 500, 0, 50, "CHARISSA/PHY");
+
+ // L2
+ name = Form("CHA%d_L2_XY_COR", i+1);
+ AddHisto2D(name, name, 500, 0, 50, 500, 0, 50, "CHARISSA/PHY");
+ }
+
+ // ID Plot
+ // E-TOF:
+ name = "CHA_E_TOF";
+ AddHisto2D(name, name,500,0,50,1000,200,1200,"CHARISSA/PHY");
+
+ // SILIE-DE:
+ name = "CHA_SILIE_E";
+ AddHisto2D(name, name,500,0,200,500,0,50,"CHARISSA/PHY");
+
+ // CSI-DE:
+ name = "CHA_CSIE_E";
+ AddHisto2D(name, name,500,0,500,500,0,50,"CHARISSA/PHY");
+
+ // Etot-DE:
+ name = "CHA_Etot_E";
+ AddHisto2D(name, name,500,0,500,500,0,50,"CHARISSA/PHY");
+
+
+ // ID plot detector by detector
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) { // loop on number of detectors
+ // E-TOF:
+ name = Form("CHA%d_E_TOF",i+1);
+ AddHisto2D(name, name,500,0,50,1000,200,1200,"CHARISSA/PHY");
+
+ // SILIE-DE:
+ name = Form("CHA%d_SILIE_E",i+1);
+ AddHisto2D(name, name,500,0,200,500,0,50,"CHARISSA/PHY");
+
+ // CSI-DE:
+ name = Form("CHA%d_CSIE_E",i+1);
+ AddHisto2D(name, name,500,0,500,500,0,50,"CHARISSA/PHY");
+
+ // Etot-DE:
+ name = Form("CHA%d_Etot_E",i+1);
+ AddHisto2D(name, name,500,0,500,500,0,50,"CHARISSA/PHY");
+ }
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+void TCharissaSpectra::FillRawSpectra(TCharissaData* RawData)
+{
+ TString name;
+ TString family;
+
+ // L1_STRX_E
+ for (unsigned int i = 0; i < RawData->GetCharissaLayer1StripXEMult(); i++) {
+ name = Form("CHA%d_L1_STRX_E_RAW", RawData->GetCharissaLayer1StripXEDetectorNbr(i));
+ family = "CHARISSA/RAW/STRXE";
+ GetHisto(family,name) -> Fill(RawData->GetCharissaLayer1StripXEStripNbr(i), RawData->GetCharissaLayer1StripXEEnergy(i));
+ }
+
+ // L1_STRY_E
+ for (unsigned int i = 0; i < RawData->GetCharissaLayer1StripYEMult(); i++) {
+ name = Form("CHA%d_L1_STRY_E_RAW", RawData->GetCharissaLayer1StripYEDetectorNbr(i));
+ family = "CHARISSA/RAW/STRYE";
+ GetHisto(family,name) -> Fill(RawData->GetCharissaLayer1StripYEStripNbr(i), RawData->GetCharissaLayer1StripYEEnergy(i));
+ }
+
+ // L2_STRX_E
+ for (unsigned int i = 0; i < RawData->GetCharissaLayer2StripXEMult(); i++) {
+ name = Form("CHA%d_L2_STRX_E_RAW", RawData->GetCharissaLayer2StripXEDetectorNbr(i));
+ family = "CHARISSA/RAW/STRXE";
+ GetHisto(family,name) -> Fill(RawData->GetCharissaLayer2StripXEStripNbr(i), RawData->GetCharissaLayer2StripXEEnergy(i));
+ }
+
+ // L2_STRY_E
+ for (unsigned int i = 0; i < RawData->GetCharissaLayer2StripYEMult(); i++) {
+ name = Form("CHA%d_L2_STRY_E_RAW", RawData->GetCharissaLayer2StripYEDetectorNbr(i));
+ family = "CHARISSA/RAW/STRYE";
+ GetHisto(family,name) -> Fill(RawData->GetCharissaLayer2StripYEStripNbr(i), RawData->GetCharissaLayer2StripYEEnergy(i));
+ }
+
+ // CSI_E
+ for (unsigned int i = 0; i < RawData->GetCharissaCsIEMult(); i++) {
+ name = Form("CHA%d_CSI_E_RAW", RawData->GetCharissaCsIEDetectorNbr(i));
+ family = "CHARISSA/RAW/CSIE";
+ GetHisto(family,name) -> Fill(RawData->GetCharissaCsIECristalNbr(i), RawData->GetCharissaCsIEEnergy(i));
+ }
+
+ // L1_STRX MULT
+ int myMULT[fNumberOfTelescope];
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) myMULT[i] = 0;
+
+ for (unsigned int i = 0; i < RawData->GetCharissaLayer1StripXEMult(); i++) myMULT[RawData->GetCharissaLayer1StripXEDetectorNbr(i)-1] += 1;
+
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) {
+ name = Form("CHA%d_L1_STRX_RAW_MULT", i+1);
+ family = "CHARISSA/RAW/MULT";
+ GetHisto(family,name) -> Fill(myMULT[i]);
+ }
+
+ // L1_STRY MULT
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) myMULT[i] = 0;
+
+ for (unsigned int i = 0; i < RawData->GetCharissaLayer1StripYEMult(); i++) myMULT[RawData->GetCharissaLayer1StripYEDetectorNbr(i)-1] += 1;
+
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) {
+ name = Form("CHA%d_L1_STRY_RAW_MULT", i+1);
+ family = "CHARISSA/RAW/MULT";
+ GetHisto(family,name) -> Fill(myMULT[i]);
+ }
+
+ // L2_STRX MULT
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) myMULT[i] = 0;
+
+ for (unsigned int i = 0; i < RawData->GetCharissaLayer2StripXEMult(); i++) myMULT[RawData->GetCharissaLayer2StripXEDetectorNbr(i)-1] += 1;
+
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) {
+ name = Form("CHA%d_L2_STRX_RAW_MULT", i+1);
+ family = "CHARISSA/RAW/MULT";
+ GetHisto(family,name) -> Fill(myMULT[i]);
+ }
+
+ // L2_STRY MULT
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) myMULT[i] = 0;
+
+ for (unsigned int i = 0; i < RawData->GetCharissaLayer2StripYEMult(); i++) myMULT[RawData->GetCharissaLayer2StripYEDetectorNbr(i)-1] += 1;
+
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) {
+ name = Form("CHA%d_L2_STRY_RAW_MULT", i+1);
+ family = "CHARISSA/RAW/MULT";
+ GetHisto(family,name) -> Fill(myMULT[i]);
+ }
+
+ // CSI MULT
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) myMULT[i] = 0;
+
+ for (unsigned int i = 0; i < RawData->GetCharissaCsIEMult();i++) myMULT[RawData->GetCharissaCsIEDetectorNbr(i)-1] += 1;
+
+ for( unsigned int i = 0; i < fNumberOfTelescope; i++) {
+ name = Form("CHA%d_CSI_RAW_MULT", i+1);
+ family = "CHARISSA/RAW/MULT";
+ GetHisto(family,name) -> Fill(myMULT[i]);
+ }
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+void TCharissaSpectra::FillPreTreatedSpectra(TCharissaData* PreTreatedData)
+{
+ TString name;
+ TString family;
+
+ // L1_STRX_E
+ for (unsigned int i = 0; i < PreTreatedData->GetCharissaLayer1StripXEMult(); i++) {
+ name = Form("CHA%d_L1_STRX_E_CAL", PreTreatedData->GetCharissaLayer1StripXEDetectorNbr(i));
+ family = "CHARISSA/CAL/STRXE";
+ GetHisto(family,name) -> Fill(PreTreatedData->GetCharissaLayer1StripXEStripNbr(i), PreTreatedData->GetCharissaLayer1StripXEEnergy(i));
+ }
+
+ // L1_STRY_E
+ for (unsigned int i = 0; i < PreTreatedData->GetCharissaLayer1StripYEMult(); i++) {
+ name = Form("CHA%d_L1_STRY_E_CAL", PreTreatedData->GetCharissaLayer1StripYEDetectorNbr(i));
+ family = "CHARISSA/CAL/STRYE";
+ GetHisto(family,name) -> Fill(PreTreatedData->GetCharissaLayer1StripYEStripNbr(i), PreTreatedData->GetCharissaLayer1StripYEEnergy(i));
+ }
+
+ // L2_STRX_E
+ for (unsigned int i = 0; i < PreTreatedData->GetCharissaLayer2StripXEMult(); i++) {
+ name = Form("CHA%d_L2_STRX_E_CAL", PreTreatedData->GetCharissaLayer2StripXEDetectorNbr(i));
+ family = "CHARISSA/CAL/STRXE";
+ GetHisto(family,name) -> Fill(PreTreatedData->GetCharissaLayer2StripXEStripNbr(i), PreTreatedData->GetCharissaLayer2StripXEEnergy(i));
+ }
+
+ // L2_STRY_E
+ for (unsigned int i = 0; i < PreTreatedData->GetCharissaLayer2StripYEMult(); i++) {
+ name = Form("CHA%d_L2_STRY_E_CAL", PreTreatedData->GetCharissaLayer2StripYEDetectorNbr(i));
+ family = "CHARISSA/CAL/STRYE";
+ GetHisto(family,name) -> Fill(PreTreatedData->GetCharissaLayer2StripYEStripNbr(i), PreTreatedData->GetCharissaLayer2StripYEEnergy(i));
+ }
+
+ // CSI_E
+ for (unsigned int i = 0; i < PreTreatedData->GetCharissaCsIEMult(); i++) {
+ name = Form("CHA%d_CSI_E_CAL", PreTreatedData->GetCharissaCsIEDetectorNbr(i));
+ family = "CHARISSA/CAL/CSIE";
+ GetHisto(family,name) -> Fill(PreTreatedData->GetCharissaCsIECristalNbr(i), PreTreatedData->GetCharissaCsIEEnergy(i));
+ }
+
+ // L1_STRX MULT
+ int myMULT[fNumberOfTelescope];
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) myMULT[i] = 0;
+
+ for (unsigned int i = 0; i < PreTreatedData->GetCharissaLayer1StripXEMult(); i++) myMULT[PreTreatedData->GetCharissaLayer1StripXEDetectorNbr(i)-1] += 1;
+
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) {
+ name = Form("CHA%d_L1_STRX_CAL_MULT", i+1);
+ family = "CHARISSA/CAL/MULT";
+ GetHisto(family,name) -> Fill(myMULT[i]);
+ }
+
+ // L1_STRY MULT
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) myMULT[i] = 0;
+
+ for (unsigned int i = 0; i < PreTreatedData->GetCharissaLayer1StripYEMult(); i++) myMULT[PreTreatedData->GetCharissaLayer1StripYEDetectorNbr(i)-1] += 1;
+
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) {
+ name = Form("CHA%d_L1_STRY_CAL_MULT", i+1);
+ family = "CHARISSA/CAL/MULT";
+ GetHisto(family,name) -> Fill(myMULT[i]);
+ }
+
+ // L2_STRX MULT
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) myMULT[i] = 0;
+
+ for (unsigned int i = 0; i < PreTreatedData->GetCharissaLayer2StripXEMult(); i++) myMULT[PreTreatedData->GetCharissaLayer2StripXEDetectorNbr(i)-1] += 1;
+
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) {
+ name = Form("CHA%d_L2_STRX_CAL_MULT", i+1);
+ family = "CHARISSA/CAL/MULT";
+ GetHisto(family,name) -> Fill(myMULT[i]);
+ }
+
+ // L2_STRY MULT
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) myMULT[i] = 0;
+
+ for (unsigned int i = 0; i < PreTreatedData->GetCharissaLayer2StripYEMult(); i++) myMULT[PreTreatedData->GetCharissaLayer2StripYEDetectorNbr(i)-1] += 1;
+
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) {
+ name = Form("CHA%d_L2_STRY_CAL_MULT", i+1);
+ family = "CHARISSA/CAL/MULT";
+ GetHisto(family,name) -> Fill(myMULT[i]);
+ }
+
+ // CSI MULT
+ for (unsigned int i = 0; i < fNumberOfTelescope; i++) myMULT[i] = 0;
+
+ for (unsigned int i = 0; i < PreTreatedData->GetCharissaCsIEMult();i++) myMULT[PreTreatedData->GetCharissaCsIEDetectorNbr(i)-1] += 1;
+
+ for( unsigned int i = 0; i < fNumberOfTelescope; i++) {
+ name = Form("CHA%d_CSI_CAL_MULT", i+1);
+ family = "CHARISSA/CAL/MULT";
+ GetHisto(family,name) -> Fill(myMULT[i]);
+ }
+}
+
+
+/*
+////////////////////////////////////////////////////////////////////////////////
+void TCharissaSpectra::FillPhysicsSpectra(TCharissaPhysics* Physics)
+{
+ TString name;
+ TString family= "CHARISSA/PHY";
+ // X-Y Impact Matrix
+
+ for(unsigned int i = 0 ; i < Physics->Si_E.size(); i++){
+ name = "CHA_IMPACT_MATRIX";
+ double x = Physics->GetPositionOfInteraction(i).x();
+ double y = Physics->GetPositionOfInteraction(i).y();
+ GetHisto(family,name)-> Fill(x,y);
+
+ name = "CHA_THETA_E";
+ double Theta = Physics->GetPositionOfInteraction(i).Angle(TVector3(0,0,1));
+ Theta = Theta/deg;
+ GetHisto(family,name)-> Fill(Theta,Physics->Si_E[i]);
+
+ // STRX_E_CAL
+ name = Form("CHA%d_XY_COR", Physics->TelescopeNumber[i]);
+ GetHisto(family,name)-> Fill(Physics->Si_EX[i],Physics->Si_EY[i]);
+
+
+ // Fill only for particle stopped in the first stage
+ if(Physics->SiLi_E[i]<0 && Physics->CsI_E[i]<0){
+ // E-TOF:
+ name = "CHA_E_TOF";
+ GetHisto(family,name)->Fill(Physics->Si_E[i],Physics->Si_T[i]);
+
+ name = Form("CHA%d_E_TOF", Physics->TelescopeNumber[i]);
+ GetHisto(family,name)->Fill(Physics->Si_E[i],Physics->Si_T[i]);
+ }
+
+ double Etot=0;
+ if(Physics->SiLi_E[i]>0){
+ name = "CHA_SILIE_E";
+ Etot = Physics->SiLi_E[i];
+ GetHisto(family,name)->Fill(Physics->SiLi_E[i],Physics->Si_E[i]);
+
+ name = Form("CHA%d_SILIE_E", Physics->TelescopeNumber[i]);
+ GetHisto(family,name)->Fill(Physics->SiLi_E[i],Physics->Si_E[i]);
+ }
+
+ if(Physics->CsI_E[i]>0){
+ name = "CHA_CSIE_E";
+ Etot += Physics->CsI_E[i];
+ GetHisto(family,name)->Fill(Physics->CsI_E[i],Physics->Si_E[i]);
+ name = Form("CHA%d_CSIE_E", Physics->TelescopeNumber[i]);
+ GetHisto(family,name)->Fill(Physics->CsI_E[i],Physics->Si_E[i]);
+
+ }
+
+ if(Etot>0){
+ name = "CHA_Etot_E";
+ GetHisto(family,name)->Fill(Etot,Physics->Si_E[i]);
+ name = Form("CHA%d_Etot_E", Physics->TelescopeNumber[i]);
+ GetHisto(family,name)->Fill(Etot,Physics->Si_E[i]);
+ }
+
+ }
+}*/
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+TH1* TCharissaSpectra::AddHisto1D(TString name, TString title, Int_t nbinsx, Double_t xlow, Double_t xup, TString family){
+ // create histo
+ TH1 *hist = new TH1D(name, title, nbinsx, xlow, xup);
+
+ vector<TString> index ;
+ index.push_back(family);
+ index.push_back(name);
+
+ // fill map
+ fMapHisto[index]=hist;
+
+ return hist;
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+TH1* TCharissaSpectra::AddHisto2D(TString name, TString title, Int_t nbinsx, Double_t xlow, Double_t xup, Int_t nbinsy, Double_t ylow, Double_t yup, TString family){
+ // create histo
+ TH1 *hist = new TH2D(name, title, nbinsx, xlow, xup, nbinsy, ylow, yup);
+
+ vector<TString> index ;
+ index.push_back(family);
+ index.push_back(name);
+
+ // fill map
+ fMapHisto[index]=hist;
+
+ return hist;
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+TH1* TCharissaSpectra::GetHisto(TString family, TString name){
+ vector<TString> index ;
+ index.push_back(family);
+ index.push_back(name);
+
+ // fill map
+ return fMapHisto.at(index);
+}
+
+
+
+////////////////////////////////////////////////////////////////////////////////
+void TCharissaSpectra::WriteHisto(TString filename)
+{
+ TFile *f = NULL;
+
+ if (filename != "VOID") {
+ f = new TFile(filename, "RECREATE");
+ }
+
+ map< vector<TString>, TH1* >::iterator it;
+ for (it=fMapHisto.begin(); it!=fMapHisto.end(); ++it) {
+ it->second->Write();
+ }
+
+ if (filename != "VOID") {
+ f->Close();
+ delete f;
+ }
+}
+
+
+
+///////////////////////////////////////////////////////////////////////////////
+void TCharissaSpectra::CheckSpectra()
+{
+ map< vector<TString>, TH1* >::iterator it;
+ Color_t ok_color = kTeal+9;
+ Color_t warning_color = kOrange+8; warning_color *= 1;
+ Color_t bad_color = kRed; bad_color *= 1;
+
+ for (it=fMapHisto.begin(); it!=fMapHisto.end(); ++it)
+ {
+ it->second->SetLineColor(ok_color);
+ it->second->SetFillStyle(1001);
+ it->second->SetFillColor(ok_color);
+ }
+}
diff --git a/NPLib/Charissa/TCharissaSpectra.h b/NPLib/Charissa/TCharissaSpectra.h
new file mode 100644
index 0000000000000000000000000000000000000000..1002cbdcc36514878e4ccf82ff08f472ae0644c4
--- /dev/null
+++ b/NPLib/Charissa/TCharissaSpectra.h
@@ -0,0 +1,86 @@
+#ifndef TMUST2SPECTRA_H
+#define TMUST2SPECTRA_H
+/*****************************************************************************
+ * Copyright (C) 2009-2013 this file is part of the NPTool Project *
+ * *
+ * For the licensing terms see $NPTOOL/Licence/NPTool_Licence *
+ * For the list of contributors see $NPTOOL/Licence/Contributors *
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Original Author: N. de Sereville contact address: deserevi@ipno.in2p3.fr *
+ * *
+ * Creation Date : dec 2013 *
+ * Last update : *
+ *---------------------------------------------------------------------------*
+ * Decription: *
+ * This class holds all the online spectra needed for Charissa *
+ * *
+ *---------------------------------------------------------------------------*
+ * Comment: *
+ * + first version (not complete yet) *
+ * *
+ * *
+ *****************************************************************************/
+
+// C++ STL headers
+#include <map>
+
+// ROOT headers
+#include "TObject.h"
+#include <TH1.h>
+#include <TH2.h>
+#include <TString.h>
+
+// NPLib headers
+#include "TCharissaData.h"
+//#include "TCharissaPhysics.h"
+using namespace std;
+
+// ForwardDeclaration
+//class TCharissaPhysics;
+
+class TCharissaSpectra {
+ public:
+ // constructor and destructor
+ TCharissaSpectra();
+ TCharissaSpectra(unsigned int NumberOfTelescope);
+ ~TCharissaSpectra();
+
+ private:
+ // Instantiate and register histo to maps
+ TH1* AddHisto1D(TString name, TString title, Int_t nbinsx, Double_t xlow, Double_t xup, TString family);
+ TH1* AddHisto2D(TString name, TString title, Int_t nbinsx, Double_t xlow, Double_t xup,
+ Int_t nbinsy, Double_t ylow, Double_t yup, TString family);
+
+ // Initialization methods
+ void InitRawSpectra();
+ void InitPreTreatedSpectra();
+ void InitPhysicsSpectra();
+
+ public:
+ // Filling methods
+ void FillRawSpectra(TCharissaData*);
+ void FillPreTreatedSpectra(TCharissaData*);
+// void FillPhysicsSpectra(TCharissaPhysics*);
+ // Check the Spectra
+ void CheckSpectra();
+
+ public:
+ // get map histo which will be used for GSpectra in GUser
+ map< vector<TString>, TH1* > GetMapHisto() const {return fMapHisto;}
+ TH1* GetHisto(TString family,TString name);
+ void WriteHisto(TString filename="VOID");
+
+ private: // Information on MUST2
+ unsigned int fNumberOfTelescope;
+ unsigned int fStripX;
+ unsigned int fStripY;
+ unsigned int fCrystalCsI;
+
+ private:
+ // map holding histo pointers and their family names
+ map< vector<TString>, TH1* > fMapHisto;
+};
+
+#endif