From 304bebf4670f27c76ea15f5cb440f1952937bcfd Mon Sep 17 00:00:00 2001 From: athena Date: Sat, 6 Aug 2022 01:38:01 -0400 Subject: [PATCH] remove *.cxx and *.pcm from repository --- .gitignore | 2 + DigitizerClass.cpp | 3 +- FSUDAQDict.cxx | 150 ------------------------------------------- FSUDAQDict_rdict.pcm | Bin 1613 -> 0 bytes Makefile | 3 +- 5 files changed, 6 insertions(+), 152 deletions(-) delete mode 100644 FSUDAQDict.cxx delete mode 100644 FSUDAQDict_rdict.pcm diff --git a/.gitignore b/.gitignore index 074d01e..0acd3a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ *.o +*.pcm +*.cxx test FSUDAQ diff --git a/DigitizerClass.cpp b/DigitizerClass.cpp index effea10..262f685 100644 --- a/DigitizerClass.cpp +++ b/DigitizerClass.cpp @@ -171,7 +171,8 @@ int Digitizer::OpenDigitizer(int boardID, int portID, bool verbose){ } int Digitizer::CloseDigitizer(){ - + + if( !isConnected ) return 0; isConnected = false; printf("-------- Closing Digtizer Board : %d Port : %d \n", boardID, portID); printf(" Model %s with handle %d using %s\n", BoardInfo.ModelName, handle, LinkType == CAEN_DGTZ_USB ? "USB" : "Optical Link"); diff --git a/FSUDAQDict.cxx b/FSUDAQDict.cxx deleted file mode 100644 index 5491f3d..0000000 --- a/FSUDAQDict.cxx +++ /dev/null @@ -1,150 +0,0 @@ -// Do NOT change. Changes will be lost next time file is generated - -#define R__DICTIONARY_FILENAME FSUDAQDict - -/*******************************************************************/ -#include -#include -#include -#include -#include -#define G__DICTIONARY -#include "RConfig.h" -#include "TClass.h" -#include "TDictAttributeMap.h" -#include "TInterpreter.h" -#include "TROOT.h" -#include "TBuffer.h" -#include "TMemberInspector.h" -#include "TInterpreter.h" -#include "TVirtualMutex.h" -#include "TError.h" - -#ifndef G__ROOT -#define G__ROOT -#endif - -#include "RtypesImp.h" -#include "TIsAProxy.h" -#include "TFileMergeInfo.h" -#include -#include "TCollectionProxyInfo.h" -/*******************************************************************/ - -#include "TDataMember.h" - -// Since CINT ignores the std namespace, we need to do so in this file. -namespace std {} using namespace std; - -// Header files passed as explicit arguments -#include "FSUDAQ.h" - -// Header files passed via #pragma extra_include - -namespace ROOT { - static TClass *MainWindow_Dictionary(); - static void MainWindow_TClassManip(TClass*); - static void delete_MainWindow(void *p); - static void deleteArray_MainWindow(void *p); - static void destruct_MainWindow(void *p); - - // Function generating the singleton type initializer - static TGenericClassInfo *GenerateInitInstanceLocal(const ::MainWindow*) - { - ::MainWindow *ptr = 0; - static ::TVirtualIsAProxy* isa_proxy = new ::TIsAProxy(typeid(::MainWindow)); - static ::ROOT::TGenericClassInfo - instance("MainWindow", "FSUDAQ.h", 25, - typeid(::MainWindow), ::ROOT::Internal::DefineBehavior(ptr, ptr), - &MainWindow_Dictionary, isa_proxy, 0, - sizeof(::MainWindow) ); - instance.SetDelete(&delete_MainWindow); - instance.SetDeleteArray(&deleteArray_MainWindow); - instance.SetDestructor(&destruct_MainWindow); - return &instance; - } - TGenericClassInfo *GenerateInitInstance(const ::MainWindow*) - { - return GenerateInitInstanceLocal((::MainWindow*)0); - } - // Static variable to force the class initialization - static ::ROOT::TGenericClassInfo *_R__UNIQUE_DICT_(Init) = GenerateInitInstanceLocal((const ::MainWindow*)0x0); R__UseDummy(_R__UNIQUE_DICT_(Init)); - - // Dictionary for non-ClassDef classes - static TClass *MainWindow_Dictionary() { - TClass* theClass =::ROOT::GenerateInitInstanceLocal((const ::MainWindow*)0x0)->GetClass(); - MainWindow_TClassManip(theClass); - return theClass; - } - - static void MainWindow_TClassManip(TClass* ){ - } - -} // end of namespace ROOT - -namespace ROOT { - // Wrapper around operator delete - static void delete_MainWindow(void *p) { - delete ((::MainWindow*)p); - } - static void deleteArray_MainWindow(void *p) { - delete [] ((::MainWindow*)p); - } - static void destruct_MainWindow(void *p) { - typedef ::MainWindow current_t; - ((current_t*)p)->~current_t(); - } -} // end of namespace ROOT for class ::MainWindow - -namespace { - void TriggerDictionaryInitialization_FSUDAQDict_Impl() { - static const char* headers[] = { -"FSUDAQ.h", -0 - }; - static const char* includePaths[] = { -"/usr/local/cern/include", -"/home/catrina/FSUDAQ/", -0 - }; - static const char* fwdDeclCode = R"DICTFWDDCLS( -#line 1 "FSUDAQDict dictionary forward declarations' payload" -#pragma clang diagnostic ignored "-Wkeyword-compat" -#pragma clang diagnostic ignored "-Wignored-attributes" -#pragma clang diagnostic ignored "-Wreturn-type-c-linkage" -extern int __Cling_Autoloading_Map; -class __attribute__((annotate("$clingAutoload$FSUDAQ.h"))) MainWindow; -)DICTFWDDCLS"; - static const char* payloadCode = R"DICTPAYLOAD( -#line 1 "FSUDAQDict dictionary payload" - -#ifndef G__VECTOR_HAS_CLASS_ITERATOR - #define G__VECTOR_HAS_CLASS_ITERATOR 1 -#endif - -#define _BACKWARD_BACKWARD_WARNING_H -#include "FSUDAQ.h" - -#undef _BACKWARD_BACKWARD_WARNING_H -)DICTPAYLOAD"; - static const char* classesHeaders[]={ -"MainWindow", payloadCode, "@", -nullptr}; - - static bool isInitialized = false; - if (!isInitialized) { - TROOT::RegisterModule("FSUDAQDict", - headers, includePaths, payloadCode, fwdDeclCode, - TriggerDictionaryInitialization_FSUDAQDict_Impl, {}, classesHeaders, /*has no C++ module*/false); - isInitialized = true; - } - } - static struct DictInit { - DictInit() { - TriggerDictionaryInitialization_FSUDAQDict_Impl(); - } - } __TheDictionaryInitializer; -} -void TriggerDictionaryInitialization_FSUDAQDict() { - TriggerDictionaryInitialization_FSUDAQDict_Impl(); -} diff --git a/FSUDAQDict_rdict.pcm b/FSUDAQDict_rdict.pcm deleted file mode 100644 index 9b85e3ec060a9b642d588c997381a32534d54b00..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1613 zcmXTQ&o5zM_^^P1fgy!~fz20)xq)maAZ7&O02UyT3d9h=*l!qrOO#vi?b^jV@^>}t zdk>Q!ME5X&3<}BPR=USv0X7+E8v_Gth+Ae(s+gX>TX3k0W1vfBa!Gtq3Xs$*NX})z zCCuS2n1&)EqVUjnRDxO1OIg@aVcGapx9TNin6)157Mw$-Hlyz^;ks+w_+WpsqS@po6}1-WStD(XI!@3ftN z+~u>3#l50^$C76|zW17GHkEaKfXbICkWcU*UC$pc3Bx62PYto;$Z*Dkq$kMqw~)&C9?wie9p?N->w<(BXy*rZJ` zecP*D^^;U~IVN*Ei@uws$}jfg75CgZUQD&OeK{Pj9mJ;11DEC7B*)~RVqSbbVzSNGkYMXFi+r<7mm$a9CVVC`? z{8yH5PX4d3sp;p-EGe>x#suR?Q*NV_Q*uQ*4=l$=1G4LmN?xoIqTlZ`(Ueq?f zWx#xuUu08UQk0pOZYLBU@0gdIS_~8laQ5{}%uOxkf#f}flFX7EXpscW z{lL7;C=NCZT&@7~KhQAz!<)%{@07o1eSO5S3 diff --git a/Makefile b/Makefile index da14e97..6c5fff0 100755 --- a/Makefile +++ b/Makefile @@ -34,7 +34,8 @@ DigitizerPHA.o : DigitizerPHA.cpp DigitizerPHA.h DigitizerClass.o DigitizerPSD.o : DigitizerPSD.cpp DigitizerPSD.h DigitizerClass.o $(CC) $(COPTS) -c DigitizerPSD.cpp -test : test.cpp DigitizerClass.o DigitizerPHA.o DigitizerPSD.o +test : test.cpp DigitizerClass.o DigitizerPHA.o DigitizerPSD.o + @echo "--------- making test" $(CC) $(COPTS) -o test test.cpp DigitizerClass.o DigitizerPHA.o DigitizerPSD.o $(CAENLIBS)